From nobody Tue Feb 10 00:46:52 2026 X-Original-To: dev-commits-src-all@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 4f92vJ4Ptbz6R54s for ; Tue, 10 Feb 2026 00:46:52 +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 4f92vJ1lxZz4GHw for ; Tue, 10 Feb 2026 00:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684412; 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=ZlpDT8EwBVjZkyifJm72ox57MnMUal3FcAUzTUGB00g=; b=KKB2YxMb/DSko+rRwlzyyDpTk7O4SWpGrmrIuRejncUkxZit+a7GAZGRmXaVReu2blJhcr 1jSX6hfxXozCuMn17YNbiNZCkhqRccj17tmMw9h+bppKEufW13BGz8ytzYh0lNOke/fn5h EZnT1duxLcqSqGBDRq7AgEDW27ALKu8lLTDyoibm2hA2QiFkNQftu0C8Kz9jhdqMMr/2nN ii6yIyTGm5OIyZ+Y6C76NA+r180Kk0W+iOwNVMAk9Hj2uUAdOJ82mcIG33Jz9f6I3/4JHy NMprI7AgG7iIoogAKmCslJ1DXoX8QNTWD1u8grv2Nb3llr42t/4LDup3soccIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684412; a=rsa-sha256; cv=none; b=PvrWx2VeV0cTeQLOOgT+Hh0rbEoyzAFfOvlXGNVIsBrgu/FUfKdz3J79aywya2k1enYqx5 a4vJ7n18uetiJzMbtY0tSjwogpQGu/HIORE6rCQ7dhJcUJeuMv/pY2HcrwmcERTpxe3MaH HZGwNqSo/DnjH4bIHLHgXn/MP5O+pKwHgv5VwSG+Lz8Z9wuiPRv9NZfurWmhFHsU/8+OgA YstU25wQUD06cJYs7hA722ldkLA0Qq0ImPNdpL380mtQr1JBBu2Zsjqn2PihNAsicQSmXD OQmDO4IwhGB3EW+TppayngODXLiMIKh2Bm8tiqmwCpQWDYOr2Tr8zoIQlVqWpw== 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=1770684412; 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=ZlpDT8EwBVjZkyifJm72ox57MnMUal3FcAUzTUGB00g=; b=daW/AnH1y5wJ2v9eEAfJhQJ6/RHLr78KyCIS7C9qMDOrsM64DGtilLO/7IJbitaccV9a4P bc+Q3xtLZjxnZ9Z7kjfZYeoaKCvBoR6/q+axHPZY27CtaGPhyBAbHt2CZRSJJ8FtJpu/Z2 Q4m/9dPxagO6pNc1I1p1meQM8X8IFbW/zHPY+r9uK0Q+uObCX34oqMj9cRn6XGUDa7Wbq8 +VPPAQnCxvpCcZKwwch+akW6NFv1eEztoEhQISO4P0qu7Tk57hTNQ1FxEi3Fky/PsxUxuo tga3YSLdXsEsAg/8/DCyOLC9qzKLJGOh4cqn7KnKlsbSqBWjmo9ecoy64pXu7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vJ1GhKzx0y for ; Tue, 10 Feb 2026 00:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 305b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c45b60cab05b - main - ath10k: harmonize all MODULE_DEPEND to ath10k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: c45b60cab05b47b1d87bf49e58f669d9aaf72765 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:52 +0000 Message-Id: <698a7ffc.305b8.7f228af9@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c45b60cab05b47b1d87bf49e58f669d9aaf72765 commit c45b60cab05b47b1d87bf49e58f669d9aaf72765 Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:29:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:46 +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. MFC after: 3 days --- 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