From nobody Fri Feb 27 02:29:37 2026 X-Original-To: dev-commits-src-branches@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 4fMXN20tQHz6T7l9 for ; Fri, 27 Feb 2026 02:29:38 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXN15rd3z40sv for ; Fri, 27 Feb 2026 02:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159377; 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=B3I198gj17dWpHFeYqWi6bItuf4a/YdxI961xYMga8Y=; b=KzLaAhy4hHht2iaZdyN/vY+NcOC/zADuVirQDUFSW76DHlwvKr/60cjK4a/HvN7xkXLglg +n8xMumeihI5kakmfSP5LbZTjD4IL9JG1dosdlgMjsgRIdEsUB/lRSKIZ3Ic8UU9mi3qzQ frFY+9J+IL+y6nnYsW94AxNy77FONT52ydMTWlfIE+SgparhCxLMvXYhz8ytpe8rvxOu5F 3SnIxL7jMRMAJYhw+Pa1f2t9B2B4ciB7E3UkOrImG/rIxVZ3bVSI1B1Yd1S9QfZbBikO5l pAZ3Ux+B4oynDLRz9r3BoXya0hi4JFOdXICTJrgfqN+Q+3bEC/G1WhjfaF8IHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159377; a=rsa-sha256; cv=none; b=mR0inoBc6zg+zemMHYdnTLRF2VzYgETSed9lrdf+OxWeVY3bP8auYLNGB8g7STtObOqlHY HyUOnOVCEahzqJyd9ES/tLrxV5Nqc/VpMBzdJ8K/LWuzBf2lEOXtWpoJPbLvqQy5PlgIxH YXc8i7jKufraIsoNdObX7MESmlqu8mc61fi1mLxOTvJeQsz4j3Js5mIdrK9nBjIGJfhsT4 HPX3HES2jG99vAq2zrsiYZX3+5rY7ALJsxuL47qdkISeVFGlNZaGh/ezGhfxIZX7cHomsz HaFaPCb8xJqLIiHArBlyoQ/pj/OB8rIMsky44vHmN8u+X/06+MmUVnTS7fpiqw== 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=1772159377; 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=B3I198gj17dWpHFeYqWi6bItuf4a/YdxI961xYMga8Y=; b=jwEiSnh+FszEZccw2ycSJJk+9KacYWqh0NC76F2ZFUTaHJjKLiZdccaOuayZp6W3asRsLM xXjnp+CnIEktlgn30tgV/T8W6qjP3H7UKR1oFIUd9AchOkS63EnadyoV9LoxXb9Da87oD+ v/fupuIwn9n7enRWQJgUaROpAY2KjhP7ew3QfK+JLGkTa3V5h2II8t7mSsJ8YOzcXFGAmy Xo2C4DcJM033OvqdaHcnI6bxYv/lSISipiOlllHND7NCy1INTtg7fO0fI+t4CT0EcX1LSV H5h5wKqbszVQZwYHS+LsDuW+CKSvo5cMZiPFAcu32Tm1gHtstcr8BXIghad15w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXN15LfZzyGw for ; Fri, 27 Feb 2026 02:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20fbb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: a90e903d807f - stable/15 - mt76: sort out MODULE_DEPEND for PCI and USB List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: a90e903d807f359da63c9955155ba2487322c3c7 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:37 +0000 Message-Id: <69a10191.20fbb.15d5a329@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a90e903d807f359da63c9955155ba2487322c3c7 commit a90e903d807f359da63c9955155ba2487322c3c7 Author: Bjoern A. Zeeb AuthorDate: 2026-02-02 01:24:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:01:19 +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 (cherry picked from commit b129f79a8985a92cd061afa4ee31311cfe31d285) --- 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