104 lines
3.6 KiB
Diff
104 lines
3.6 KiB
Diff
|
From 9df7ddc3ed25b7d3473f117a0680b9418adb5753 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <9df7ddc3ed25b7d3473f117a0680b9418adb5753.1515610034.git.mschiffer@universe-factory.net>
|
||
|
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
|
|
Date: Mon, 27 Nov 2017 18:56:22 +0100
|
||
|
|
Subject: [PATCH 1/2] ath9k: move spectral scan support under a separate config
|
||
|
|
symbol
|
||
|
|
|
||
|
|
At the moment, spectral scan support, and with it RELAY, is always enabled
|
||
|
|
with ATH9K[_HTC]_DEBUGFS. Spectral scan support is currently the only user
|
||
|
|
of RELAY in ath9k, and it unconditionally reserves a relay channel.
|
||
|
|
|
||
|
|
Having debugfs support in ath9k is often useful even on very small embedded
|
||
|
|
routers, where we'd rather like to avoid the code size and RAM usage of the
|
||
|
|
relay support.
|
||
|
|
|
||
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
|
||
|
|
---
|
||
|
|
drivers/net/wireless/ath/ath9k/Kconfig | 14 ++++++++++----
|
||
|
|
drivers/net/wireless/ath/ath9k/Makefile | 4 ++--
|
||
|
|
drivers/net/wireless/ath/ath9k/common-spectral.h | 4 ++--
|
||
|
|
3 files changed, 14 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/Kconfig
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
|
||
|
|
@@ -64,13 +64,12 @@ config ATH9K_DEBUGFS
|
||
|
|
depends on ATH9K && DEBUG_FS
|
||
|
|
select MAC80211_DEBUGFS
|
||
|
|
select ATH9K_COMMON_DEBUG
|
||
|
|
- depends on RELAY
|
||
|
|
---help---
|
||
|
|
Say Y, if you need access to ath9k's statistics for
|
||
|
|
interrupts, rate control, etc.
|
||
|
|
|
||
|
|
- Also required for changing debug message flags at run time.
|
||
|
|
- As well as access to the FFT/spectral data and TX99.
|
||
|
|
+ Also required for changing debug message flags at run time and for
|
||
|
|
+ TX99.
|
||
|
|
|
||
|
|
config ATH9K_STATION_STATISTICS
|
||
|
|
bool "Detailed station statistics"
|
||
|
|
@@ -181,7 +180,6 @@ config ATH9K_HTC_DEBUGFS
|
||
|
|
bool "Atheros ath9k_htc debugging"
|
||
|
|
depends on ATH9K_HTC && DEBUG_FS
|
||
|
|
select ATH9K_COMMON_DEBUG
|
||
|
|
- depends on RELAY
|
||
|
|
---help---
|
||
|
|
Say Y, if you need access to ath9k_htc's statistics.
|
||
|
|
As well as access to the FFT/spectral data.
|
||
|
|
@@ -197,3 +195,11 @@ config ATH9K_HWRNG
|
||
|
|
|
||
|
|
Say Y, feeds the entropy directly from the WiFi driver to the input
|
||
|
|
pool.
|
||
|
|
+
|
||
|
|
+config ATH9K_COMMON_SPECTRAL
|
||
|
|
+ bool "Atheros ath9k/ath9k_htc spectral scan support"
|
||
|
|
+ depends on ATH9K_DEBUGFS || ATH9K_HTC_DEBUGFS
|
||
|
|
+ depends on RELAY
|
||
|
|
+ default n
|
||
|
|
+ ---help---
|
||
|
|
+ Say Y to enable access to the FFT/spectral data via debugfs.
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/Makefile
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/Makefile
|
||
|
|
@@ -61,8 +61,8 @@ ath9k_common-y:= common.o \
|
||
|
|
common-init.o \
|
||
|
|
common-beacon.o \
|
||
|
|
|
||
|
|
-ath9k_common-$(CPTCFG_ATH9K_COMMON_DEBUG) += common-debug.o \
|
||
|
|
- common-spectral.o
|
||
|
|
+ath9k_common-$(CPTCFG_ATH9K_COMMON_DEBUG) += common-debug.o
|
||
|
|
+ath9k_common-$(CPTCFG_ATH9K_COMMON_SPECTRAL) += common-spectral.o
|
||
|
|
|
||
|
|
ath9k_htc-y += htc_hst.o \
|
||
|
|
hif_usb.o \
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/common-spectral.h
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/common-spectral.h
|
||
|
|
@@ -151,7 +151,7 @@ static inline u8 spectral_bitmap_weight(
|
||
|
|
return bins[0] & 0x3f;
|
||
|
|
}
|
||
|
|
|
||
|
|
-#ifdef CPTCFG_ATH9K_COMMON_DEBUG
|
||
|
|
+#ifdef CPTCFG_ATH9K_COMMON_SPECTRAL
|
||
|
|
void ath9k_cmn_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dentry *debugfs_phy);
|
||
|
|
void ath9k_cmn_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv);
|
||
|
|
|
||
|
|
@@ -183,6 +183,6 @@ static inline int ath_cmn_process_fft(st
|
||
|
|
{
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
-#endif /* CPTCFG_ATH9K_COMMON_DEBUG */
|
||
|
|
+#endif /* CPTCFG_ATH9K_COMMON_SPECTRAL */
|
||
|
|
|
||
|
|
#endif /* SPECTRAL_H */
|
||
|
|
--- a/local-symbols
|
||
|
|
+++ b/local-symbols
|
||
|
|
@@ -116,6 +116,7 @@ ATH9K_PCOEM=
|
||
|
|
ATH9K_HTC=
|
||
|
|
ATH9K_HTC_DEBUGFS=
|
||
|
|
ATH9K_HWRNG=
|
||
|
|
+ATH9K_COMMON_SPECTRAL=
|
||
|
|
CARL9170=
|
||
|
|
CARL9170_LEDS=
|
||
|
|
CARL9170_DEBUGFS=
|