The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc
commit fe7b6fc32455389d1b8452c67e1ddcfbc4e5f5cc Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2025-12-06 09:57:06 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2025-12-06 09:59:11 +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. MFC after: 3 days --- 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}
