From nobody Fri Feb 27 02:29:58 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 4fMXNQ6wDkz6T7x8 for ; Fri, 27 Feb 2026 02:29:58 +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 4fMXNQ5Hrkz41SN for ; Fri, 27 Feb 2026 02:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159398; 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=d6zoCg9lHgjO1GiZheBY6CiwI0ialdkU+vKfkj+jh18=; b=wH5bhpeXkiiMW0b1HXVmG497v+kXCB9ucZY5xIZnfwr928flPcEhlZmKISl9alUnL3K4RJ nCm4aSEE9pJQ67G3r2UZRqxA5EDgspfu/K/IcVmKCnYjYrf7xAgLviH0vlDn3Jpcfo5acX 1hMRRMMBKjDyZJo9is0r9xXpk6daocj0sZLoi9vqau5OIEUeueWdEVuNhawbCdgY6o0y/j u/J4Msi1lGuahk3eoJDLB+bCGgFPq527d2VphbBKvERfrC9qpLJujhBkWnaHU7mwW/eSZw ir6YiKZREAgXVOav21cQjs4BU86csPhlSH1z6HORyevMVdOg46vvOH5/gI+DRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159398; a=rsa-sha256; cv=none; b=eYgUgFZFvS4dlStgITYB2yUeOIcj7VNzv5HzGtzdLmtHgAN+evP5FT/nY4ddnniJx3MWxO KcRU1o7/9TjKDafsYW0QtAdxgRYH/LX8CLSDdOnE7d1sVa4PePNGX95KytTPqeMDuFFwD0 30M47pMOYGfwsHuoOT+NdHn5BRNxLOwr5OwORQ1tRXO60XkJc7TVgp/yIegI2G15y6E0w2 uByeaPYSMScuPRc0DQhsxe9wQ6rHC5BqcYjsUHqOk+4uah/utzoQK+sOTuBQOJcYwwCMIV j5tvEdYuFdv036Yc0msUHFiqJIGILGMPsXkO09sRCLF4Jni5eM+OUU/kdHtfHQ== 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=1772159398; 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=d6zoCg9lHgjO1GiZheBY6CiwI0ialdkU+vKfkj+jh18=; b=BkuAnuvzBttMmWc26+LDHEh1JePSbFGvRGAIf2VNGlZKiOeMuG7A5uLsY1X/6ZqB9cJeSW UfTJslxyraEsop5WhGSKdfD0SSPO8sAEPs/MQ8qeRRrbgNgdbDIWQXfhWEKSa1Btg0jVnt jyN1dqpP1NaTbavwtkTijWuEopBG8Ugu0XcMEEeyVesBIGXAzXs/ytnGeBZrFEGEvskZDO MID6JTzY9s28GnrTfYntfg5kC2O9PSNPRR+2HiwitalQNtKeLpBRraZEiLSbV7VWFpgx/P 4PmsWNrMqxo8LBCYxpQJ6KUbQlggmx3vjxRXebkUIl7gD3W9ScTtrq4gjBCpKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNQ4pFDzyg6 for ; Fri, 27 Feb 2026 02:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21a23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 3c6c9a9f043b - stable/15 - ath10k: modules Makefile bus attachments 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: 3c6c9a9f043b30523329c06bf9e1ec1954ff6831 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:58 +0000 Message-Id: <69a101a6.21a23.61c69192@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3c6c9a9f043b30523329c06bf9e1ec1954ff6831 commit 3c6c9a9f043b30523329c06bf9e1ec1954ff6831 Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:31:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:05:59 +0000 ath10k: modules Makefile bus attachments Given USB in theory compiles add it to the Makefile. The upstream support was never finished and I see little chances it ever will be so keep USB disabled by default. (cherry picked from commit 32efafda38288848ec71e97eddf085ee0c108109) --- sys/modules/ath10k/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index 93518c66f89f..16f481116357 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -2,6 +2,10 @@ DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} +# Bus attachments. +WITH_PCI= 1 +WITH_USB= 0 # Never finished upstream, not working. + WITH_CONFIG_FWLOG= 1 WITH_LEDS= 0 @@ -12,7 +16,15 @@ SRCS+= htc.c htt.c htt_rx.c htt_tx.c SRCS+= txrx.c wmi.c wmi-tlv.c SRCS+= p2p.c swap.c +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c +.endif + +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +.endif # Other SRCS+= ${LINUXKPI_GENSRCS}