Merge tag 'wireless-drivers-next-for-davem-2016-11-25' of git://git.kernel.org/pub...

[mirror_ubuntu-artful-kernel.git] / drivers / net / wireless / ath / ath10k / core.h

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 521f1c55c19ee150e99403b8238cb54f065fc673..e8decfaba5b6ed4c3ee6b3280d8cec399571e5f0 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -557,10 +557,8 @@ enum ath10k_fw_features {
         */
        ATH10K_FW_FEATURE_BTCOEX_PARAM = 14,
 
-       /* Older firmware with HTT delivers incorrect tx status for null func
-        * frames to driver, but this fixed in 10.2 and 10.4 firmware versions.
-        * Also this workaround results in reporting of incorrect null func
-        * status for 10.4. This flag is used to skip the workaround.
+       /* Unused flag and proven to be not working, enable this if you want
+        * to experiment sending NULL func data frames in HTT TX
         */
        ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR = 15,
 
@@ -714,6 +712,7 @@ struct ath10k {
        u32 phy_capability;
        u32 hw_min_tx_power;
        u32 hw_max_tx_power;
+       u32 hw_eeprom_rd;
        u32 ht_cap_info;
        u32 vht_cap_info;
        u32 num_rf_chains;
@@ -912,6 +911,19 @@ struct ath10k {
        struct net_device napi_dev;
        struct napi_struct napi;
 
+       struct work_struct set_coverage_class_work;
+       /* protected by conf_mutex */
+       struct {
+               /* writing also protected by data_lock */
+               s16 coverage_class;
+
+               u32 reg_phyclk;
+               u32 reg_slottime_conf;
+               u32 reg_slottime_orig;
+               u32 reg_ack_cts_timeout_conf;
+               u32 reg_ack_cts_timeout_orig;
+       } fw_coverage;
+
        /* must be last */
        u8 drv_priv[0] __aligned(sizeof(void *));
 };