message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OpTjpByFE/pDk4iTK/h8AYn5RcQ/Xb/3RmOxwHhx96g=; b=KylmKoKz4sd73Y2mqBqT+cHjC+HVQPNF4Hiu5tlpjs7Cw5eK+bjqJPjn940xKsjbH4AU9w Y32zUg4zaHeGAkPR6N0td8Moi7TFOK4GEK4XXoKRwfMo87Q/Sspl+5dX5EIiCdQsZWQvge 5D8bD2PkXhVr8te6O0RTiWovKZytO40paPdcvgBWZpOOAo16GeAC0etX5y6EtAxLla2t4o W6s/uUL3DSAsWp9XgMSy/bR3wf9RbxWnFL9IoT3er3w7U72PpHAo5WzNs/36bXxjLu5PLW UDVG8zd9BGWhSloEbEYLIrz5wEQXIFhx0FR/WciQQsF6bHFh4Yz37xiKfnZutg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822195; a=rsa-sha256; cv=none; b=qliCE3hlqaXZXt5C8q+kQh9iOeDivRa0cLy9mRQDUCEQxxgdK0fuQx7U5uTY9y4Rh09qnv 6Edh0ftSuNo78ij1m9vvCDNI50wwV9NzTZ1ITmoxQCXRmBwzPQkv7+RxzJPeiho3x2ZqC4 vhcXaO2ZeBwvwFOUNy8nBOYi5kUkGRNy8rjgCP2gGpRSgfLzbu2+V1TefjLOmXPbfDNAIl T1WrpcqKuPGA6rt04gkIRJXz/X9EF0BAdWAc6WgqsPQvGy1ijDgljvylLGiNA96sL1JM9a 1YXqf6ucHw3/PmcLyyODrFNeQx66mr3TpuzPdmndP3BBXMNM3BSZHJRF71QWeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVSl66mGyzVpg for ; Mon, 15 Dec 2025 18:09:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24aba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:09:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 3ebd7cbfea2f - stable/15 - LinuxKPI: ath10k: adjust for led changes to keep ath10k compiling 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: 3ebd7cbfea2fffa27bf41c53148e51d84c315797 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:09:54 +0000 Message-Id: <69404ef2.24aba.5e993387@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3ebd7cbfea2fffa27bf41c53148e51d84c315797 commit 3ebd7cbfea2fffa27bf41c53148e51d84c315797 Author: Bjoern A. Zeeb AuthorDate: 2025-12-06 09:57:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-15 18:09:20 +0000 LinuxKPI: ath10k: adjust for led changes to keep ath10k compiling Add the conditional compile time option defaulting to off as we do not support leds in LinuxKPI to ath10k for the new file. Add empty struct gpio_led to LinuxKPI. (cherry picked from commit fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc) --- sys/compat/linuxkpi/common/include/linux/leds.h | 5 ++++- sys/modules/ath10k/Makefile | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/leds.h b/sys/compat/linuxkpi/common/include/linux/leds.h index 89f7286f6800..b9b694f6e304 100644 --- a/sys/compat/linuxkpi/common/include/linux/leds.h +++ b/sys/compat/linuxkpi/common/include/linux/leds.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2025 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -38,4 +38,7 @@ struct led_classdev { void (*led_set)(struct led_classdev *, enum led_brightness); }; +struct gpio_led { +}; + #endif /* _LINUXKPI_LINUX_LEDS_H */ diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index eb02bda1699f..98df270b6791 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -3,6 +3,7 @@ DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} WITH_CONFIG_FWLOG= 1 +WITH_LEDS= 0 KMOD= if_ath10k @@ -22,6 +23,11 @@ SRCS+= fwlog.c CFLAGS+= -DCONFIG_FWLOG=${WITH_CONFIG_FWLOG} .endif +.if defined(WITH_LEDS) && ${WITH_LEDS} > 0 +CFLAGS+= -DCONFIG_ATH10K_LEDS +SRCS+= leds.c +.endif + CFLAGS+= -DKBUILD_MODNAME='"ath10k"' CFLAGS+= -I${DEVATH10KDIR}