From nobody Tue Mar 31 20:28:13 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 4flfnn6BqYz6Y08Y for ; Tue, 31 Mar 2026 20:28:13 +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 4flfnn52PLz3Qt5 for ; Tue, 31 Mar 2026 20:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774988893; 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=kUltUQYey5NrzKCEoYKqFoJYd1m7Zl89NK3UhiVewuY=; b=eLjYuuXl1Hp6uE+WpLq1nOAmtsc8AZp6pOUJSYqkRIE4tIAIm7fdVsNO5MGXpcvqLVnJC4 SIr1ZyTBwb2JQ26bQQ3K2TIyPwSEhEvApYslIKJYnJRNnCQ+iXIJfUBaJ5g2lQYbbnP26g nkLYfT5gvXgdVy9In149Z9M/nkjTMQqeW30G7thgCWj+FT+e1Y60zI8veMxtQMpbU0MzoN FeZh78Y7wyE6NfZbM1TzNes24DoN8jwWdHb0REtlt7YtUnerbBs6QhEQzHlP38fLqFLStd Yhv/M2vt4IfwK4qfeEqXW18OrzZci7OXGIe5fbOJ0d1hAr4AzOOmXwi4gxC9/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774988893; a=rsa-sha256; cv=none; b=xaqwVjkObdcaIcVj6Q3lz9JQZoBFqiExT5vE1ln0bBghi2yMGCykfOqMjjMVm8YeizWO8x j3C5CAt9Y5pE3vfdWLxtTi2nbfxkmtJzERkLYrdk0r4dINg4MqBQ2MouX4UmsEx9/zp+Jd SzaIIlB74YhtIOcq1wHRck9Cnvspa2PjXtd69oNTFim6e/ywCX8II8ou5W1O3CxEM3k10G geVGlvyzZqpr+URH61xQv6lsKzPECgMxAp9DLr1XRr2WMOq0CCm+LzfFL7k3MFJaae4jCX 8dL/klZucK9Kar6fjW6TPBGxXlBlqcHyiRu+GT1xz37XvjRj43Bn0wGFFEtkdg== 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=1774988893; 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=kUltUQYey5NrzKCEoYKqFoJYd1m7Zl89NK3UhiVewuY=; b=v0ApAkhdt5/UKheCnRWzCZHGsufCfHWrCUaeGrZsS6BsRuTqzVbcQtQxss4/y0sFL9h/7b YZIDx9z/FuOF3/kw2t5zxtSS72i6w7AAtQAisJnaZSgzAWsMjm1rX9Fm87cQqWqVeAUu5n Kr+hsQP72cvcl/YXUGw/wNTrhbKLdjAsF3C8eLeYoz1eK0i/Sgg4bpTKiq4glNCudNSzIT ilm9GVJXH4bG0ruOduZPo71+q6KC7wIsTGZR5Ng8N1TtstR1a06PoNfN5Mvp5hR01oqCmk ygecPHB1s8ZE8XBl+H3XxtyAU3zyqtnn5mIsy/Q7l36Y9HWYVkW6/ZSpTB3+/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flfnn4cYRzlF3 for ; Tue, 31 Mar 2026 20:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26a8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 20:28:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ff68a58546ee - stable/15 - ath12k: update module Makefile after vendor import of v6.19 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: ff68a58546ee7d7270daf7c5d373de47a71161b9 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 20:28:13 +0000 Message-Id: <69cc2e5d.26a8b.6acb5c12@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ff68a58546ee7d7270daf7c5d373de47a71161b9 commit ff68a58546ee7d7270daf7c5d373de47a71161b9 Author: Bjoern A. Zeeb AuthorDate: 2026-03-12 15:47:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-31 16:22:51 +0000 ath12k: update module Makefile after vendor import of v6.19 Sponsored by: The FreeBSD Foundation (cherry picked from commit 03ba27c194ca5937478502cb52a0eda8146f9be1) --- sys/modules/ath12k/Makefile | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index 674a68e12813..ff61769bd99e 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -2,28 +2,51 @@ DEVATH12KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath12k .PATH: ${DEVATH12KDIR} -WITH_CONFIG_ATH12K_TRACING= 0 +ATH12K_ACPI= 0 +ATH12K_AHB= 0 +ATH12K_COREDUMP= 0 +ATH12K_DEBUGFS= 0 +ATH12K_PM= 0 +ATH12K_TRACING= 0 KMOD= if_ath12k SRCS+= core.c hal.c hal_tx.c hal_rx.c SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c dp_mon.c debug.c -SRCS+= ce.c peer.c dbring.c hw.c +SRCS+= ce.c peer.c dbring.c hw.c fw.c p2p.c SRCS+= mhi.c pci.c -.if defined(WITH_CONFIG_ATH12K_TRACING) && ${WITH_CONFIG_ATH12K_TRACING} > 0 -CFLAGS+= -DCONFIG_ATH12K_TRACING=${WITH_CONFIG_ATH12K_TRACING} +.if defined(ATH12K_AHB) && ${ATH12K_AHB} > 0 +CFLAGS+= -DCONFIG_ATH12K_AHB +SRCS+= ahb.c +.endif +.if defined(ATH12K_DEBUGFS) && ${ATH12K_DEBUGFS} > 0 +CFLAGS+= -DCONFIG_ATH12K_DEBUGFS +SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c +.endif +.if defined(ATH12K_ACPI) && ${ATH12K_ACPI} > 0 +CFLAGS+= -DCONFIG_ATH12K_ACPI +SRCS+= acpi.c +.endif +.if defined(ATH12K_TRACING) && ${ATH12K_TRACING} > 0 +CFLAGS+= -DCONFIG_ATH12K_TRACING SRCS+= trace.c .endif +.if defined(ATH12K_PM) && ${ATH12K_PM} > 0 +CFLAGS+= -DCONFIG_PM +SRCS+= wow.c +.endif +.if defined(ATH12K_COREDUMP) && ${ATH12K_COREDUMP} > 0 +CFLAGS+= -DCONFIG_ATH12K_COREDUMP +SRCS+= coredump.c +.endif # Other SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"ath12k"' - CFLAGS+= -I${DEVATH12KDIR} CFLAGS+= -I${DEVATH12KDIR}/.. CFLAGS+= ${LINUXKPI_INCLUDES} @@ -32,4 +55,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_ATH12K_DEBUG +CFLAGS+= -DKBUILD_MODNAME='"ath12k"' +CFLAGS+= -DLINUXKPI_VERSION=61900 + .include