git: b129f79a8985 - main - mt76: sort out MODULE_DEPEND for PCI and USB

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Sat, 07 Feb 2026 00:58:23 UTC
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=b129f79a8985a92cd061afa4ee31311cfe31d285

commit b129f79a8985a92cd061afa4ee31311cfe31d285
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2026-02-02 01:24:07 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-02-07 00:57:51 +0000

    mt76: sort out MODULE_DEPEND for PCI and USB
    
    It is not enough to depend on mt76_core which then depends on linuxkpi
    and linuxkpi_wlan.  Given each mt76 driver is its own module, each
    also needs to depend on these linuxkpi modules.
    In addition the core module usb part also has to depend on linuxkpi_usb.
    
    This in addition to the previously sorted PCI drivers, allows (or will
    allow) the individual chipsets (drivers) to load on systems with USB,
    if compiled in, as well.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      3 days
---
 sys/contrib/dev/mediatek/mt76/mt7615/pci.c | 2 +-
 sys/contrib/dev/mediatek/mt76/mt7915/pci.c | 2 +-
 sys/contrib/dev/mediatek/mt76/mt7921/pci.c | 2 +-
 sys/contrib/dev/mediatek/mt76/mt7921/usb.c | 7 +++++++
 sys/contrib/dev/mediatek/mt76/mt7925/pci.c | 2 +-
 sys/contrib/dev/mediatek/mt76/mt7925/usb.c | 7 +++++++
 sys/contrib/dev/mediatek/mt76/mt7996/pci.c | 2 +-
 sys/contrib/dev/mediatek/mt76/usb.c        | 3 +++
 8 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/sys/contrib/dev/mediatek/mt76/mt7615/pci.c b/sys/contrib/dev/mediatek/mt76/mt7615/pci.c
index fe181d269419..ae701dc7d9c3 100644
--- a/sys/contrib/dev/mediatek/mt76/mt7615/pci.c
+++ b/sys/contrib/dev/mediatek/mt76/mt7615/pci.c
@@ -206,7 +206,7 @@ MODULE_FIRMWARE(MT7663_FIRMWARE_N9);
 MODULE_FIRMWARE(MT7663_ROM_PATCH);
 #if defined(__FreeBSD__)
 MODULE_VERSION(mt7615_pci, 1);
+MODULE_DEPEND(mt7615_pci, mt76_core, 1, 1, 1);
 MODULE_DEPEND(mt7615_pci, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(mt7615_pci, linuxkpi_wlan, 1, 1, 1);
-MODULE_DEPEND(mt7615_pci, mt76_core, 1, 1, 1);
 #endif
diff --git a/sys/contrib/dev/mediatek/mt76/mt7915/pci.c b/sys/contrib/dev/mediatek/mt76/mt7915/pci.c
index 4e94a137c077..2eb2b7079057 100644
--- a/sys/contrib/dev/mediatek/mt76/mt7915/pci.c
+++ b/sys/contrib/dev/mediatek/mt76/mt7915/pci.c
@@ -266,7 +266,7 @@ MODULE_FIRMWARE(MT7916_FIRMWARE_WM);
 MODULE_FIRMWARE(MT7916_ROM_PATCH);
 #if defined(__FreeBSD__)
 MODULE_VERSION(mt7915_pci, 1);
+MODULE_DEPEND(mt7915_pci, mt76_core, 1, 1, 1);
 MODULE_DEPEND(mt7915_pci, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(mt7915_pci, linuxkpi_wlan, 1, 1, 1);
-MODULE_DEPEND(mt7915_pci, mt76_core, 1, 1, 1);
 #endif
diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/pci.c b/sys/contrib/dev/mediatek/mt76/mt7921/pci.c
index 30660837077f..46b59c4d0390 100644
--- a/sys/contrib/dev/mediatek/mt76/mt7921/pci.c
+++ b/sys/contrib/dev/mediatek/mt76/mt7921/pci.c
@@ -595,7 +595,7 @@ MODULE_DESCRIPTION("MediaTek MT7921E (PCIe) wireless driver");
 MODULE_LICENSE("Dual BSD/GPL");
 #if defined(__FreeBSD__)
 MODULE_VERSION(mt7921_pci, 1);
+MODULE_DEPEND(mt7921_pci, mt76_core, 1, 1, 1);
 MODULE_DEPEND(mt7921_pci, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(mt7921_pci, linuxkpi_wlan, 1, 1, 1);
-MODULE_DEPEND(mt7921_pci, mt76_core, 1, 1, 1);
 #endif
diff --git a/sys/contrib/dev/mediatek/mt76/mt7921/usb.c b/sys/contrib/dev/mediatek/mt76/mt7921/usb.c
index 17057e68bf21..64881ef7cbf4 100644
--- a/sys/contrib/dev/mediatek/mt76/mt7921/usb.c
+++ b/sys/contrib/dev/mediatek/mt76/mt7921/usb.c
@@ -346,3 +346,10 @@ module_usb_driver(mt7921u_driver);
 MODULE_DESCRIPTION("MediaTek MT7921U (USB) wireless driver");
 MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");
 MODULE_LICENSE("Dual BSD/GPL");
+#if defined(__FreeBSD__)
+MODULE_VERSION(mt7921_usb, 1);
+MODULE_DEPEND(mt7921_usb, mt76_core, 1, 1, 1);
+MODULE_DEPEND(mt7921_usb, linuxkpi, 1, 1, 1);
+MODULE_DEPEND(mt7921_usb, linuxkpi_wlan, 1, 1, 1);
+MODULE_DEPEND(mt7921_usb, linuxkpi_usb, 1, 1, 1);
+#endif
diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c
index 021f431c9ded..d57e1aacf112 100644
--- a/sys/contrib/dev/mediatek/mt76/mt7925/pci.c
+++ b/sys/contrib/dev/mediatek/mt76/mt7925/pci.c
@@ -651,7 +651,7 @@ MODULE_DESCRIPTION("MediaTek MT7925E (PCIe) wireless driver");
 MODULE_LICENSE("Dual BSD/GPL");
 #if defined(__FreeBSD__)
 MODULE_VERSION(mt7925_pci, 1);
+MODULE_DEPEND(mt7925_pci, mt76_core, 1, 1, 1);
 MODULE_DEPEND(mt7925_pci, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(mt7925_pci, linuxkpi_wlan, 1, 1, 1);
-MODULE_DEPEND(mt7925_pci, mt76_core, 1, 1, 1);
 #endif
diff --git a/sys/contrib/dev/mediatek/mt76/mt7925/usb.c b/sys/contrib/dev/mediatek/mt76/mt7925/usb.c
index d9968f03856d..437c073d6a5b 100644
--- a/sys/contrib/dev/mediatek/mt76/mt7925/usb.c
+++ b/sys/contrib/dev/mediatek/mt76/mt7925/usb.c
@@ -344,3 +344,10 @@ module_usb_driver(mt7925u_driver);
 MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");
 MODULE_DESCRIPTION("MediaTek MT7925U (USB) wireless driver");
 MODULE_LICENSE("Dual BSD/GPL");
+#if defined(__FreeBSD__)
+MODULE_VERSION(mt7925_usb, 1);
+MODULE_DEPEND(mt7925_usb, mt76_core, 1, 1, 1);
+MODULE_DEPEND(mt7925_usb, linuxkpi, 1, 1, 1);
+MODULE_DEPEND(mt7925_usb, linuxkpi_wlan, 1, 1, 1);
+MODULE_DEPEND(mt7925_usb, linuxkpi_usb, 1, 1, 1);
+#endif
diff --git a/sys/contrib/dev/mediatek/mt76/mt7996/pci.c b/sys/contrib/dev/mediatek/mt76/mt7996/pci.c
index 241599dcbc72..5ca3b0819acb 100644
--- a/sys/contrib/dev/mediatek/mt76/mt7996/pci.c
+++ b/sys/contrib/dev/mediatek/mt76/mt7996/pci.c
@@ -287,7 +287,7 @@ MODULE_FIRMWARE(MT7990_FIRMWARE_WM);
 MODULE_FIRMWARE(MT7990_ROM_PATCH);
 #if defined(__FreeBSD__)
 MODULE_VERSION(mt7996_pci, 1);
+MODULE_DEPEND(mt7996_pci, mt76_core, 1, 1, 1);
 MODULE_DEPEND(mt7996_pci, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(mt7996_pci, linuxkpi_wlan, 1, 1, 1);
-MODULE_DEPEND(mt7996_pci, mt76_core, 1, 1, 1);
 #endif
diff --git a/sys/contrib/dev/mediatek/mt76/usb.c b/sys/contrib/dev/mediatek/mt76/usb.c
index 67c976bb9c22..b0d04a465f35 100644
--- a/sys/contrib/dev/mediatek/mt76/usb.c
+++ b/sys/contrib/dev/mediatek/mt76/usb.c
@@ -1141,3 +1141,6 @@ EXPORT_SYMBOL_GPL(mt76u_init);
 MODULE_AUTHOR("Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>");
 MODULE_DESCRIPTION("MediaTek MT76x USB helpers");
 MODULE_LICENSE("Dual BSD/GPL");
+#if defined(__FreeBSD__)
+MODULE_DEPEND(mt76_core, linuxkpi_usb, 1, 1, 1);
+#endif