From nobody Sat Feb 7 00:58:23 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHz4WgTz6QrRt for ; Sat, 07 Feb 2026 00:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7CHz2myTz3Lm9 for ; Sat, 07 Feb 2026 00:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDoaSgHUzaeGJt+Sga94JYVkhUZLe1mvoQ8gfW4Veck=; b=V/+xPomSZurOYkQC15mwg6qLOepCnBDOdxudKLsFQeiz6oC4bGvfvPU9WlCqB0gQjZXH8+ +03muZ4xUrDpeezzy3O7mEIYBQ/ihkP1BZcySUSQlO1DbEEuRbaDbxkjFeeL5Yq3hr3x3o 30VfaCkSsNGSFs8LzDfUtVgMTWXeqbFCxciqtJPRGacLIYP/HpV+9GX/63qfHhN1p6ZLrA pgP8KfhATLXxk8a1o5NmvNnsOH71rYUhE+NXeFjOmyORIuhfkd2Ttuowx9EHZbsC0PBsvQ emildFYffjSgz5qwIJZlg0o0eVtTw8k586MIwrd1jm2ctrTZxBs9P51QIOLqcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770425903; a=rsa-sha256; cv=none; b=GTq+nVpnb2+MAL1tu6WoWgbKolwM4cihU79xyfkJ00167frRFQiJuioiM430jj7+CpLx+T elM4Hqnume2LkyVF9XoHBX+iud5aBhOAPjrUx46s8xBOVud8DhRaDJsn+QK7TeRW+LKuE6 /G716qzbqTtjXI9hrW/WDDM19JziPw0SyVDlkVq1GLvEboqgUtD6IvsWNsid2j6Liz3eY+ urMZ8sEtxZzwYA2z4feuCfqxwWhYGyunJKy7YX1s+kKaI7JGn+WXAxdeBrf2QL7Q1rLpNS XYkqDsPQJssggY/OT/b7VN9vQlIJfluJLM69GwkkgVDXO6H0Pu/S1tIw604oLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770425903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDoaSgHUzaeGJt+Sga94JYVkhUZLe1mvoQ8gfW4Veck=; b=dUNlXqBK+q41G8ViKmHZlOKqdCH/CtmNwK9ifRC9i6Ek4mNnPlAJjP+0LPRBaYnttKGW09 KOP22VJ98tmjbCzQ5LaI0mrmBmi/Rkn3mVNJeoV8vYs5ooQwWGN2ywxi/M4K4KyL76zHr1 JHmmLWREPHYnnlczutydiBfzKjud+6Mxc8E+pNnFJZUG5C72w3xgHcIo/WlOVTDdUzvLE1 rd37UFhlY0f8WtLcoQcTatjeHMcJ8g+KBNVEH1c6fy5YPTnxV6nks9JOTVclItrXPez+kX NymLrxzsiE6GiGzelDjR0FQ0gcSQJEU5XZWQo5v1PEAQO9RJk3VaqE+yvIPoWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7CHz28Kyzg1p for ; Sat, 07 Feb 2026 00:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34978 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 00:58:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b129f79a8985 - main - mt76: sort out MODULE_DEPEND for PCI and USB List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b129f79a8985a92cd061afa4ee31311cfe31d285 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 00:58:23 +0000 Message-Id: <69868e2f.34978.34f0a549@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b129f79a8985a92cd061afa4ee31311cfe31d285 commit b129f79a8985a92cd061afa4ee31311cfe31d285 Author: Bjoern A. Zeeb AuthorDate: 2026-02-02 01:24:07 +0000 Commit: Bjoern A. Zeeb 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 "); 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 "); 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 "); MODULE_DESCRIPTION("MediaTek MT76x USB helpers"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_DEPEND(mt76_core, linuxkpi_usb, 1, 1, 1); +#endif