Merge "UPSTREAM: ath10k: move spectral scan support under a separate config symbol" (3779b1f8) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/net/wireless/ath/ath10k/Kconfig

+8 −1

Original line number	Diff line number	Diff line
		@@ -47,12 +47,19 @@ config ATH10K_DEBUG
		config ATH10K_DEBUGFS
		bool "Atheros ath10k debugfs support"
		depends on ATH10K && DEBUG_FS
		select RELAY
		---help---
		Enabled debugfs support

		If unsure, say Y to make it easier to debug problems.

		config ATH10K_SPECTRAL
		bool "Atheros ath10k spectral scan support"
		depends on ATH10K_DEBUGFS
		select RELAY
		default n
		---help---
		Say Y to enable access to the FFT/spectral data via debugfs.

		config ATH10K_TRACING
		bool "Atheros ath10k tracing support"
		depends on ATH10K

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ ath10k_core-y += mac.o \
		p2p.o \
		swap.o

		ath10k_core-$(CONFIG_ATH10K_DEBUGFS) += spectral.o
		ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += spectral.o
		ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
		ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o
		ath10k_core-$(CONFIG_THERMAL) += thermal.o

+1 −1

Original line number	Diff line number	Diff line
		@@ -463,7 +463,7 @@ struct ath10k_fw_crash_data {
		bool crashed_since_read;

		guid_t guid;
		struct timespec timestamp;
		struct timespec64 timestamp;
		__le32 registers[REG_DUMP_COUNT_QCA988X];
		struct ath10k_ce_crash_data ce_crash_data[CE_COUNT_MAX];
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -728,7 +728,7 @@ ath10k_debug_get_new_fw_crash_data(struct ath10k *ar)

		crash_data->crashed_since_read = true;
		guid_gen(&crash_data->guid);
		getnstimeofday(&crash_data->timestamp);
		ktime_get_real_ts64(&crash_data->timestamp);

		return crash_data;
		}

+0 −9

Original line number	Diff line number	Diff line
		@@ -8331,15 +8331,6 @@ int ath10k_mac_register(struct ath10k *ar)
		ath10k_warn(ar, "failed to initialise DFS pattern detector\n");
		}

		/* Current wake_tx_queue implementation imposes a significant
		* performance penalty in some setups. The tx scheduling code needs
		* more work anyway so disable the wake_tx_queue unless firmware
		* supports the pull-push mechanism.
		*/
		if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,
		ar->running_fw->fw_file.fw_features))
		ar->ops->wake_tx_queue = NULL;

		ret = ath10k_mac_init_rd(ar);
		if (ret) {
		ath10k_err(ar, "failed to derive regdom: %d\n", ret);