The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bc1f3a730c0f832efec9374d9305337b64053a3e
commit bc1f3a730c0f832efec9374d9305337b64053a3e Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2026-02-07 22:29:44 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2026-02-26 23:05:47 +0000 ath10k: harmonize all MODULE_DEPEND to ath10k With theoretically multiple bus attachements (unclear if we will ever support anything but PCI) rename the module name to "ath10k" and use it consistently. Move the common depends to core.c and lindebugfs and usb to their respective files. (cherry picked from commit c45b60cab05b47b1d87bf49e58f669d9aaf72765) --- sys/contrib/dev/athk/ath10k/core.c | 6 ++++++ sys/contrib/dev/athk/ath10k/debug.c | 6 ++++++ sys/contrib/dev/athk/ath10k/pci.c | 9 --------- sys/contrib/dev/athk/ath10k/usb.c | 3 +++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/sys/contrib/dev/athk/ath10k/core.c b/sys/contrib/dev/athk/ath10k/core.c index 6167338b5c79..a1fd099487fd 100644 --- a/sys/contrib/dev/athk/ath10k/core.c +++ b/sys/contrib/dev/athk/ath10k/core.c @@ -3870,3 +3870,9 @@ EXPORT_SYMBOL(ath10k_core_destroy); MODULE_AUTHOR("Qualcomm Atheros"); MODULE_DESCRIPTION("Core module for Qualcomm Atheros 802.11ac wireless LAN cards."); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_VERSION(ath10k, 1); +MODULE_DEPEND(ath10k, linuxkpi, 1, 1, 1); +MODULE_DEPEND(ath10k, linuxkpi_wlan, 1, 1, 1); +MODULE_DEPEND(ath10k, athk_common, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/athk/ath10k/debug.c b/sys/contrib/dev/athk/ath10k/debug.c index 8a79f5418585..7a9e54cfb23b 100644 --- a/sys/contrib/dev/athk/ath10k/debug.c +++ b/sys/contrib/dev/athk/ath10k/debug.c @@ -2777,3 +2777,9 @@ trace: ; EXPORT_SYMBOL(ath10k_dbg_dump); #endif /* CONFIG_ATH10K_DEBUG */ + +#if defined(__FreeBSD__) +#ifdef CONFIG_ATH10K_DEBUGFS +MODULE_DEPEND(ath10k, debugfs, 1, 1, 1); +#endif +#endif diff --git a/sys/contrib/dev/athk/ath10k/pci.c b/sys/contrib/dev/athk/ath10k/pci.c index e9b8573a698b..f4c9af1e12fc 100644 --- a/sys/contrib/dev/athk/ath10k/pci.c +++ b/sys/contrib/dev/athk/ath10k/pci.c @@ -3933,15 +3933,6 @@ module_exit(ath10k_pci_exit); MODULE_AUTHOR("Qualcomm Atheros"); MODULE_DESCRIPTION("Driver support for Qualcomm Atheros PCIe/AHB 802.11ac WLAN devices"); MODULE_LICENSE("Dual BSD/GPL"); -#if defined(__FreeBSD__) -MODULE_VERSION(ath10k_pci, 1); -MODULE_DEPEND(ath10k_pci, linuxkpi, 1, 1, 1); -MODULE_DEPEND(ath10k_pci, linuxkpi_wlan, 1, 1, 1); -MODULE_DEPEND(ath10k_pci, athk_common, 1, 1, 1); -#ifdef CONFIG_ATH10K_DEBUGFS -MODULE_DEPEND(ath10k_pci, debugfs, 1, 1, 1); -#endif -#endif /* QCA988x 2.0 firmware files */ MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API2_FILE); diff --git a/sys/contrib/dev/athk/ath10k/usb.c b/sys/contrib/dev/athk/ath10k/usb.c index 1732a4f98418..9dfa179ba610 100644 --- a/sys/contrib/dev/athk/ath10k/usb.c +++ b/sys/contrib/dev/athk/ath10k/usb.c @@ -1128,3 +1128,6 @@ module_usb_driver(ath10k_usb_driver); MODULE_AUTHOR("Atheros Communications, Inc."); MODULE_DESCRIPTION("Driver support for Qualcomm Atheros USB 802.11ac WLAN devices"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_DEPEND(ath10k, linuxkpi_usb, 1, 1, 1); +#endif
