The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=99e5ffe1ba4001f4b893d12ab746cb4472b42757
commit 99e5ffe1ba4001f4b893d12ab746cb4472b42757 Author: Mark O'Donovan <[email protected]> AuthorDate: 2023-07-01 17:06:50 +0000 Commit: Warner Losh <[email protected]> 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 <[email protected]> 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 <sys/nv.h> +#include <sys/iov_schema.h> +#include <dev/pci/pci_iov.h> +#endif /* #ifdef CONFIG_ECORE_SRIOV */ + #include <sys/smp.h> /* 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 <sys/smp.h> #include <sys/sched.h> -#ifdef CONFIG_ECORE_SRIOV -#include <sys/nv.h> -#include <sys/iov_schema.h> -#include <dev/pci/pci_iov.h> -#endif /* #ifdef CONFIG_ECORE_SRIOV */ - static __inline int qlnx_ms_to_hz(int ms) { int qlnx_hz;
