From nobody Fri Feb 27 02:29:56 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 4fMXNP1LBhz6T7dl for ; Fri, 27 Feb 2026 02:29:57 +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 4fMXNN44t3z41Hn for ; Fri, 27 Feb 2026 02:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159396; 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=jcRHIyiYpQLp/ByxCJ3Eyj3iVQRThhGpnXb7JSMBsRk=; b=quRld5HS1zAlbUXT1zLuZNFAM0uYZpANyGvhg4uCPWnYgfSxP4iKptjmllSKC/DhIJ9grv EU1+NAkpK4IKj/ztRC/uS037H7108pSOz8PnvcPKmeYc0NRhD0KhrIjX/oUy2Ne4PLNq60 Bzt2JDb9ovbGtq+n4Nd8PrGo6PlCdfZEZ3TX3Y5FRqEunsjzh1iRlIyYJQAeQzS1p5RyXw 9gbrKFNbEdAE+cGFbr6RZxawgR0SDigNraDltJf5FuNBXF8gk7MVac3wsFcfejupEsBQ9S xc52MDEc498pQjAnxXcGhMej+oMTPfDWTfnuAkWY5bKavC65/HcWvgm41xvvBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159396; a=rsa-sha256; cv=none; b=YfhlU5CzDJST7zfmBU9H22MhKYlDBzVMN66UeM9MmF57y8K5nfy6wbTLaB0dk9lvOk+8ox 4r9bgdy/bJmb9rcEoO/HTjMWWALYU8hbAnOSSsbOLUrFn2JDQcmW8ckGFof9458ME0SB6l FKyN3Axxzc11foV5CdVo+MlW0ZxORNqjontKuH3McOzHFwFo5vgkqRV5P0sdr2WWN96KkA OkTO6voR3myCl0o6zoG5wHNHcPaDMLuddma2m1iM2yEyWoEHiS9QYycSAj3/BHkASAvpx8 1q8j8o3rgYJzAkvqZ052cQMNIpkOD+8RCRzG9mHXDkhrp09lFwlp+e+d79F2wA== 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=1772159396; 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=jcRHIyiYpQLp/ByxCJ3Eyj3iVQRThhGpnXb7JSMBsRk=; b=UCtP422d17vk4ig11h/tNNlxWAEZXD1bylbjK6Sx6k5SVfIDkbUMP8DFMS5RUD9HdIueJi AopWEiuLqW8nfytlPal1tVPKoPjEDsKpd170KlLCpx2jSmpzOLNkg4elqlLfuZqtJduFfM Fuw+rsGE9R72r3iU5MM8W/JdKVIvNJNPU0QiOIbf+31ywRRkq9We/pViYscj22s5hvzLkn AcMh9VovgF+PCmswM4OM/06bPmXzqA9jwEWaX/TtAdBpT1MWu/9aV4RwKHVeX489mbt5FF KwjOOAHbIGuItmN5CoIQ4VjZ88E8Wys4T26KWLydq8p/GNgtLWr4kPY5Rhnj5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNN3DRKzyg5 for ; Fri, 27 Feb 2026 02:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f6f5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: bc1f3a730c0f - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: bc1f3a730c0f832efec9374d9305337b64053a3e Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:56 +0000 Message-Id: <69a101a4.1f6f5.454f409c@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bc1f3a730c0f832efec9374d9305337b64053a3e commit bc1f3a730c0f832efec9374d9305337b64053a3e Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:29:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:05:47 +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. (cherry picked from commit c45b60cab05b47b1d87bf49e58f669d9aaf72765) --- 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