From 2fd9ef9ddda7bd4bd351e2940a6614fdef26770c Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 23 Jun 2022 14:31:37 -0700 Subject: [PATCH] net/intel-ix-kmod: Remove unused DRIVER_MODULE devclass on recent main. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35201 --- net/intel-ix-kmod/Makefile | 1 + net/intel-ix-kmod/files/patch-if__ix.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 net/intel-ix-kmod/files/patch-if__ix.c diff --git a/net/intel-ix-kmod/Makefile b/net/intel-ix-kmod/Makefile index 2995c68ea9e7..d3bb5edf94dc 100644 --- a/net/intel-ix-kmod/Makefile +++ b/net/intel-ix-kmod/Makefile @@ -21,6 +21,7 @@ MANPAGELINKS= ix if_ix if_ixgbe MAX_NETMAP_OSVERSION= 9999999 MASTERDIR= ${.CURDIR}/../intel-ixl-kmod +PATCHDIR= ${.CURDIR}/files PKGDIR= ${.CURDIR} DISTINFO_FILE= ${.CURDIR}/distinfo diff --git a/net/intel-ix-kmod/files/patch-if__ix.c b/net/intel-ix-kmod/files/patch-if__ix.c new file mode 100644 index 000000000000..89b9ce285111 --- /dev/null +++ b/net/intel-ix-kmod/files/patch-if__ix.c @@ -0,0 +1,15 @@ +--- if_ix.c.orig 2022-05-13 22:10:39 UTC ++++ if_ix.c +@@ -241,8 +241,12 @@ static driver_t ix_driver = { + "ix", ix_methods, sizeof(struct adapter), + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(ix, pci, ix_driver, 0, 0); ++#else + devclass_t ix_devclass; + DRIVER_MODULE(ix, pci, ix_driver, ix_devclass, 0, 0); ++#endif + + MODULE_DEPEND(ix, pci, 1, 1, 1); + MODULE_DEPEND(ix, ether, 1, 1, 1);