From nobody Sat Jul 1 17:10:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qtdwk2QYkz4l3Pt; Sat, 1 Jul 2023 17:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qtdwk1yFKz3hP6; Sat, 1 Jul 2023 17:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h8jqwlOZB87R7XakbCGSYHpxRNueG39yLcTr2qHQnWo=; b=unmDMvahvoW1Ffhu9v+7WXBXDZWJq9Cvncqx4WxjLx4V0EgehX6Pfefr9QBxV4ju3Sm/Qc 4sHnKbQu60fpRFlYZBMZvgiijn/1mJodJlor2aWlwvXwTbV0rdxo4X8+vaIlz36Xcrrk6h vT2MEifjtdVqU+hL2SJ2JPgqwTTHB26Yd7+8LyLpDEAKHIY1CUWhckOQyKvjICbXsL3sqY teS3r8vv78X3RN+VQSst6el+r+RQMwke2AFQ+0HGYIZT5k+4ZpzRcOJHapbxbguBKWnbES b/00pZxntXfwF5KgaMXw4LiZQ56RyyiO5SdmSQzw9E48VBXMQshZhkJ56sQYdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h8jqwlOZB87R7XakbCGSYHpxRNueG39yLcTr2qHQnWo=; b=Offh/+JvOmrvOuWvQNj/8amh2Wwh2PYhVXuqe4SVT/G3EkMjSVUK/g0ZZtOdErGzSoLREe VZGU/JD6BwLEz8dB7ZPyMvGkxb+uXhqX5KlQswvmuBY9Giz+49qlrB13yK+Q0s9BfDQC+d E1cpDgpFnE6n5+rEulikZrHXtBNNB7W42N7SDBsJw0dmuyQx+vNSIPhmGgLwsqowgUp+mV C4tgspYj6txL1jKUh7o/u5LmxLNnE1IqrYZhw2Fs7nW7eyPMaaVcBaFoYSSUw5GkOexNK1 JsAVB8w0qXIbKTnUoXC/9QiNgmNePnOebKHWwDQoOWu46RNePedEA6AdQTqL6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688231414; a=rsa-sha256; cv=none; b=ut7AjjWYdXjr9xiaIzYJyaSJU+NqdQdkF8JkCp6ekj1OuqwgPHkSdU74RTLq42qPDlmorS Vu3OEBqLB+wp82kOyQmyUqnaAt5PnYtHUHtIFob5MOca9w7G/bCaM9dfXrRbNiOq93N0A8 K5tmGdeHWZh/+lGmAsFN9C5HH8sCxTfkj8OQx9m8z60dznp7dba5yre5q5D6SvegwD0CGq cVksQQIoxERjS+fTJ51B5onXFyIo7lqcEdFSO960CZ+jKt+hrBLt3S0sOyDGoAQtYeZosq MxD78+4kwhXWp/BhrdD3HRsQupiWse5pZxUI5+/ok/Yqj5qCQlrX2wcMb4GTRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qtdwk0xzXzZ2P; Sat, 1 Jul 2023 17:10:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361HAEeJ044927; Sat, 1 Jul 2023 17:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361HAEeX044919; Sat, 1 Jul 2023 17:10:14 GMT (envelope-from git) Date: Sat, 1 Jul 2023 17:10:14 GMT Message-Id: <202307011710.361HAEeX044919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 99e5ffe1ba40 - main - qlnxe: Move sriov includes to qlnx_os.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99e5ffe1ba4001f4b893d12ab746cb4472b42757 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=99e5ffe1ba4001f4b893d12ab746cb4472b42757 commit 99e5ffe1ba4001f4b893d12ab746cb4472b42757 Author: Mark O'Donovan AuthorDate: 2023-07-01 17:06:50 +0000 Commit: Warner Losh CommitDate: 2023-07-01 17:06:56 +0000 qlnxe: Move sriov includes to qlnx_os.c SRIOV is being enabled in ecore.h but by then the qlnx_os.h header has been processed and not included the relevant headers Signed-off-by: Mark O'Donovan Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/779 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 6 ++++++ sys/dev/qlnx/qlnxe/qlnx_os.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index bbd4c0fe7e8c..0b5dba75300b 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -68,6 +68,12 @@ __FBSDID("$FreeBSD$"); #include "qlnx_rdma.h" #endif /* #ifdef QLNX_ENABLE_IWARP */ +#ifdef CONFIG_ECORE_SRIOV +#include +#include +#include +#endif /* #ifdef CONFIG_ECORE_SRIOV */ + #include /* diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.h b/sys/dev/qlnx/qlnxe/qlnx_os.h index f7111f5e3f4b..34678d808b5d 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.h +++ b/sys/dev/qlnx/qlnxe/qlnx_os.h @@ -90,12 +90,6 @@ #include #include -#ifdef CONFIG_ECORE_SRIOV -#include -#include -#include -#endif /* #ifdef CONFIG_ECORE_SRIOV */ - static __inline int qlnx_ms_to_hz(int ms) { int qlnx_hz;