The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=28125d24c92a45883b3ab105625ec5b3ba37e320
commit 28125d24c92a45883b3ab105625ec5b3ba37e320 Merge: 8b4477f6b8e1 99ad6f4f54c8 Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2025-12-06 09:47:42 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2025-12-06 09:47:42 +0000 ath-common: update common Atheros/QCA code This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). Merge commit '99ad6f4f54c86845d6e3f03541913c07fcdeef59' sys/contrib/dev/athk/Kconfig | 68 +++++++++++++++++++++++++++++ sys/contrib/dev/athk/Makefile | 25 +++++++++++ sys/contrib/dev/athk/ath.h | 6 ++- sys/contrib/dev/athk/dfs_pattern_detector.c | 21 ++++----- sys/contrib/dev/athk/hw.c | 2 +- sys/contrib/dev/athk/key.c | 4 +- sys/contrib/dev/athk/main.c | 1 + sys/contrib/dev/athk/testmode_i.h | 66 ++++++++++++++++++++++++++++ sys/contrib/dev/athk/trace.h | 4 +- 9 files changed, 177 insertions(+), 20 deletions(-) diff --cc sys/contrib/dev/athk/Kconfig index 000000000000,910c10028b14..910c10028b14 mode 000000,100644..100644 --- a/sys/contrib/dev/athk/Kconfig +++ b/sys/contrib/dev/athk/Kconfig diff --cc sys/contrib/dev/athk/Makefile index 000000000000,000000000000..8d6e6e218d24 new file mode 100644 --- /dev/null +++ b/sys/contrib/dev/athk/Makefile @@@ -1,0 -1,0 +1,25 @@@ ++# SPDX-License-Identifier: ISC ++obj-$(CONFIG_ATH5K) += ath5k/ ++obj-$(CONFIG_ATH9K_HW) += ath9k/ ++obj-$(CONFIG_CARL9170) += carl9170/ ++obj-$(CONFIG_ATH6KL) += ath6kl/ ++obj-$(CONFIG_AR5523) += ar5523/ ++obj-$(CONFIG_WIL6210) += wil6210/ ++obj-$(CONFIG_ATH10K) += ath10k/ ++obj-$(CONFIG_WCN36XX) += wcn36xx/ ++obj-$(CONFIG_ATH11K) += ath11k/ ++obj-$(CONFIG_ATH12K) += ath12k/ ++ ++obj-$(CONFIG_ATH_COMMON) += ath.o ++ ++ath-objs := main.o \ ++ regd.o \ ++ hw.o \ ++ key.o \ ++ dfs_pattern_detector.o \ ++ dfs_pri_detector.o ++ ++ath-$(CONFIG_ATH_DEBUG) += debug.o ++ath-$(CONFIG_ATH_TRACEPOINTS) += trace.o ++ ++CFLAGS_trace.o := -I$(src) diff --cc sys/contrib/dev/athk/testmode_i.h index 000000000000,980ef2f3f05f..980ef2f3f05f mode 000000,100644..100644 --- a/sys/contrib/dev/athk/testmode_i.h +++ b/sys/contrib/dev/athk/testmode_i.h
