Merge branch 'for-linville' of git://github.com/kvalo/ath (687b9308) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/ath/ath10k/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ config ATH10K_DEBUG

		config ATH10K_DEBUGFS
		bool "Atheros ath10k debugfs support"
		depends on ATH10K
		depends on ATH10K && DEBUG_FS
		select RELAY
		---help---
		Enabled debugfs support

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ ath10k_core-y += mac.o \
		bmi.o

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

		obj-$(CONFIG_ATH10K_PCI) += ath10k_pci.o

+0 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,6 @@ struct bmi_target_info {
		u32 type;
		};


		/* in msec */
		#define BMI_COMMUNICATION_TIMEOUT_HZ (1*HZ)

+0 −2

Original line number	Diff line number	Diff line
		@@ -260,7 +260,6 @@ static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar,
		ath10k_pci_write32(ar, ce_ctrl_addr + HOST_IS_ADDRESS, mask);
		}


		/*
		* Guts of ath10k_ce_send, used by both ath10k_ce_send and
		* ath10k_ce_sendlist_send.
		@@ -385,7 +384,6 @@ int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe)
		return delta;
		}


		int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe)
		{
		struct ath10k *ar = pipe->ar;

+5 −8

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@

		#include "hif.h"


		/* Maximum number of Copy Engine's supported */
		#define CE_COUNT_MAX 8
		#define CE_HTT_H2T_MSG_SRC_NENTRIES 4096
		@@ -37,7 +36,6 @@

		struct ath10k_ce_pipe;


		#define CE_DESC_FLAGS_GATHER (1 << 0)
		#define CE_DESC_FLAGS_BYTE_SWAP (1 << 1)
		#define CE_DESC_FLAGS_META_DATA_MASK 0xFFFC
		@@ -383,7 +381,6 @@ struct ce_attr {
		#define DST_WATERMARK_HIGH_RESET 0
		#define DST_WATERMARK_ADDRESS 0x0050


		static inline u32 ath10k_ce_base_address(unsigned int ce_id)
		{
		return CE0_BASE_ADDRESS + (CE1_BASE_ADDRESS - CE0_BASE_ADDRESS) * ce_id;