From nobody Fri Feb 27 02:30:00 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 4fMXNT1m96z6T7xH for ; Fri, 27 Feb 2026 02:30:01 +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 4fMXNS6xkkz41Vy for ; Fri, 27 Feb 2026 02:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159401; 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=mCD7oQ8yFkGP6Fnov8UmQrViPQd0Sqz6d01D6qaXXq8=; b=uttrwNZT/C9xYghA/KUkwEtWP1IFgOvKUX37U5K+s28Z4zjSgYR4xbYhaRFE4+aGiKtH4k VH7loy2vF56gk8kdSSZobZDu/fSG0YHhJ5SVqynNIjPm4mOvJeVkfq4oh9A+/brUjEx1do qVJaswDXnoz5qgR6V+opLTwOSzgewTdXLFIIur1E0lD11O1scnr6f3CNfRvjG+0kOmkWxc eQDzf/vlWCSrvB7QyjHaUYJrLza9Elzv89G6BUtBMWIaHR+8z7niFSMVixF4rVuzLIVoFU oLJo9MbBwTyMlq+TCkN0N31mHhT/0hI+VQ7RJCg1tb7O5GSzkV2z1qtgrb8jxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159401; a=rsa-sha256; cv=none; b=LiaFf1Kjnnl0k/EMW32U/v9eubh3jH3W3Hkf6/u3aWCN35npvXkgQqk5vPyZNOd9mRbrYC 3Md8/6XPLvknWprPijv2nszYHL3ai4ZOr2r0nYgR7Il0bq1QlUcz2WwBwDcfef0WZG/9q6 6eFyCzatFTotYIbS01bieQ26r9ZLGa+wunMY6B2BnHgsV9ynaDMtJJ6L1GrcVG0BmwMs6T fqfSX8jsPjnu/kcklPZ8PAG88cv2pDTUFCoK6vDASoPYVO9p2bltjl1VqwXRWkFwH1eZpN aIQGOSLCjtN5lpVHogiFZ5RYlsUO890BsBHNHlW48elTOdcIUgrYc7PnJi+IqQ== 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=1772159401; 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=mCD7oQ8yFkGP6Fnov8UmQrViPQd0Sqz6d01D6qaXXq8=; b=UvQ2Y20k0oD+mnD9xvIqo/EOy/BTlDQRcGVJEdOGLOTrUU0LgJViYyVYq2xxZyKEqDGHm+ ODNb5UFkH10mIvm+oGVVwBdyeEk8MsUeNVjdYEnqcsw52J5DGclPb+cIfV2bXlOQBG8EWN fAzY2ASDEm8PpoIpfD6tz6ytrn2JKwbhddat0m/O+vnOk5N5+A76GJexeD4UFkxrqVQktG h4yrVR3j+tC1dZ5hqXtsBbmfHYpOTQp9HNfW7Q/V+Bg1B1Gb/DBWB0JCnj2CKDymfq5OJ9 wNab70pqrJaQ9bWwWJGJk1zsFBe3EDZkejhLsndMzCS9ekc5uP69aTz42Kn76A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNS6Tx9zyg8 for ; Fri, 27 Feb 2026 02:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22213 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:30:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 3e42c294ef76 - stable/15 - rtw88: harmonize all MODULE_DEPEND to rtw88 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: 3e42c294ef76e5fdfb22bb4cbf0dcc35d61b144d Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:30:00 +0000 Message-Id: <69a101a8.22213.43f4a4cc@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3e42c294ef76e5fdfb22bb4cbf0dcc35d61b144d commit 3e42c294ef76e5fdfb22bb4cbf0dcc35d61b144d Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 16:18:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:06:15 +0000 rtw88: harmonize all MODULE_DEPEND to rtw88 From the time I used to split up the driver into a core part and bus attachment sub-drivers the various bus attachments had their own module name but all is "rtw88" now. Core functionality depends on linuxkpi, linuxkpi_wlan, and for debug.c lindebugfs. Each bus attachment then depends on its own parent layer if needed: PCI gets pull in through linuxkpi, USB: depends on [the future] linuxkpi_usb, and SDIO: depends on [the future] linuxkpi_sdio. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55021 (cherry picked from commit 49c1b388d5a89761980d24aee14f3bd0db7c0dda) --- sys/contrib/dev/rtw88/debug.c | 4 ++++ sys/contrib/dev/rtw88/main.c | 5 +++++ sys/contrib/dev/rtw88/pci.c | 8 -------- sys/contrib/dev/rtw88/usb.c | 5 +---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c index 53742a3220f2..1e2b11cf1dd3 100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@ -1381,3 +1381,7 @@ void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, EXPORT_SYMBOL(rtw_dbg); #endif /* CONFIG_RTW88_DEBUG */ + +#ifdef CONFIG_RTW88_DEBUGFS +MODULE_DEPEND(rtw88, lindebugfs, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c index d9e6e9477dfb..b38709b180fd 100644 --- a/sys/contrib/dev/rtw88/main.c +++ b/sys/contrib/dev/rtw88/main.c @@ -2591,3 +2591,8 @@ void rtw_set_ampdu_factor(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek 802.11ac wireless core module"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_VERSION(rtw88, 1); +MODULE_DEPEND(rtw88, linuxkpi, 1, 1, 1); +MODULE_DEPEND(rtw88, linuxkpi_wlan, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c index e4cbaae4646f..1dc4f5915d2d 100644 --- a/sys/contrib/dev/rtw88/pci.c +++ b/sys/contrib/dev/rtw88/pci.c @@ -1964,11 +1964,3 @@ EXPORT_SYMBOL(rtw_pci_shutdown); MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek PCI 802.11ac wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); -#if defined(__FreeBSD__) -MODULE_VERSION(rtw_pci, 1); -MODULE_DEPEND(rtw_pci, linuxkpi, 1, 1, 1); -MODULE_DEPEND(rtw_pci, linuxkpi_wlan, 1, 1, 1); -#ifdef CONFIG_RTW88_DEBUGFS -MODULE_DEPEND(rtw_pci, lindebugfs, 1, 1, 1); -#endif -#endif diff --git a/sys/contrib/dev/rtw88/usb.c b/sys/contrib/dev/rtw88/usb.c index 9fe00af9fc0e..69a4cb60184f 100644 --- a/sys/contrib/dev/rtw88/usb.c +++ b/sys/contrib/dev/rtw88/usb.c @@ -1379,8 +1379,5 @@ MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek USB 802.11ac wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); #if defined(__FreeBSD__) -MODULE_VERSION(rtw88_usb, 1); -MODULE_DEPEND(rtw88_usb, rtw88_core, 1, 1, 1); -MODULE_DEPEND(rtw88_usb, linuxkpi, 1, 1, 1); -MODULE_DEPEND(rtw88_usb, linuxkpi_wlan, 1, 1, 1); +MODULE_DEPEND(rtw88, linuxkpi_usb, 1, 1, 1); #endif