Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.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 7cc7cdd56c9530d45677abf5bda7d4f54a7e639d..018c64f4fd25b8cf1ab8db0f3b21e65962a5f45e 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -214,6 +214,7 @@ struct ath10k_fw_stats_pdev {
        s32 hw_queued;
        s32 hw_reaped;
        s32 underrun;
+       u32 hw_paused;
        s32 tx_abort;
        s32 mpdus_requed;
        u32 tx_ko;
@@ -226,6 +227,16 @@ struct ath10k_fw_stats_pdev {
        u32 pdev_resets;
        u32 phy_underrun;
        u32 txop_ovf;
+       u32 seq_posted;
+       u32 seq_failed_queueing;
+       u32 seq_completed;
+       u32 seq_restarted;
+       u32 mu_seq_posted;
+       u32 mpdus_sw_flush;
+       u32 mpdus_hw_filter;
+       u32 mpdus_truncated;
+       u32 mpdus_ack_failed;
+       u32 mpdus_expired;
 
        /* PDEV RX stats */
        s32 mid_ppdu_route_change;
@@ -242,6 +253,7 @@ struct ath10k_fw_stats_pdev {
        s32 phy_errs;
        s32 phy_err_drop;
        s32 mpdu_errs;
+       s32 rx_ovfl_errs;
 };
 
 struct ath10k_fw_stats {
@@ -497,6 +509,9 @@ enum ath10k_fw_features {
         */
        ATH10K_FW_FEATURE_RAW_MODE_SUPPORT = 10,
 
+       /* Firmware Supports Adaptive CCA*/
+       ATH10K_FW_FEATURE_SUPPORTS_ADAPTIVE_CCA = 11,
+
        /* keep last */
        ATH10K_FW_FEATURE_COUNT,
 };
@@ -723,15 +738,13 @@ struct ath10k {
        bool monitor_started;
        unsigned int filter_flags;
        unsigned long dev_flags;
-       u32 dfs_block_radar_events;
+       bool dfs_block_radar_events;
 
        /* protected by conf_mutex */
        bool radar_enabled;
        int num_started_vdevs;
 
        /* Protected by conf-mutex */
-       u8 supp_tx_chainmask;
-       u8 supp_rx_chainmask;
        u8 cfg_tx_chainmask;
        u8 cfg_rx_chainmask;
 
@@ -814,9 +827,12 @@ struct ath10k {
        struct {
                /* protected by conf_mutex */
                const struct firmware *utf;
+               char utf_version[32];
+               const void *utf_firmware_data;
+               size_t utf_firmware_len;
                DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT);
                enum ath10k_fw_wmi_op_version orig_wmi_op_version;
-
+               enum ath10k_fw_wmi_op_version op_version;
                /* protected by data_lock */
                bool utf_monitor;
        } testmode;