The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8099a895d9162ace638412c5c21fe9f8e7625154
commit 8099a895d9162ace638412c5c21fe9f8e7625154 Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2021-12-27 17:36:04 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2021-12-30 18:28:11 +0000 iwlwifi: also depend on linuxkpi_wlan The 802.11 compat code is split off linuxkpi.ko into linuxkpi_wlan.ko in case it is built as a module. Depend on that. While here adjust our module to a longer version to avoid conflicts. Sponsored by: The FreeBSD Foundation (cherry picked from commit 81ff67ffbec066bc5014a64e67de0219d943156a) --- sys/contrib/dev/iwlwifi/iwl-drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/iwl-drv.c b/sys/contrib/dev/iwlwifi/iwl-drv.c index 4486920f59e1..0725e755f4a3 100644 --- a/sys/contrib/dev/iwlwifi/iwl-drv.c +++ b/sys/contrib/dev/iwlwifi/iwl-drv.c @@ -38,8 +38,9 @@ MODULE_LICENSE("GPL"); #elif defined(__FreeBSD__) #define DRV_DESCRIPTION "Intel(R) Wireless WiFi based driver for FreeBSD" MODULE_LICENSE("BSD"); -MODULE_VERSION(iwl, 1); -MODULE_DEPEND(iwl, linuxkpi, 1, 1, 1); +MODULE_VERSION(if_iwlwifi, 1); +MODULE_DEPEND(if_iwlwifi, linuxkpi, 1, 1, 1); +MODULE_DEPEND(if_iwlwifi, linuxkpi_wlan, 1, 1, 1); #endif MODULE_DESCRIPTION(DRV_DESCRIPTION);
