1 files changed, 27 insertions, 14 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 7fe68f8dd210..e84534c4d956 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -543,13 +543,12 @@ enum iwl_ucode_tlv_type {
  * enum iwl_ucode_tlv_flag - ucode API flags
  * @IWL_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously
  *      was a separate TLV but moved here to save space.
- * @IWL_UCODE_TLV_FLAGS_BTSTATS: This uCode image uses BT statistics, which
- *      may be true even if the device doesn't have BT.
+ * @IWL_UCODE_TLV_FLAGS_RESERVED_1: reserved
  * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
  */
 enum iwl_ucode_tlv_flag {
         IWL_UCODE_TLV_FLAGS_PAN         = BIT(0),
-        IWL_UCODE_TLV_FLAGS_BTSTATS     = BIT(1),
+        IWL_UCODE_TLV_FLAGS_RESERVED_1  = BIT(1),
         IWL_UCODE_TLV_FLAGS_MFP         = BIT(2),
 };
 
@@ -1357,6 +1356,31 @@ struct iwl_priv {
         u64 timestamp;
 
         struct {
+                __le32 flag;
+                struct statistics_general_common common;
+                struct statistics_rx_non_phy rx_non_phy;
+                struct statistics_rx_phy rx_ofdm;
+                struct statistics_rx_ht_phy rx_ofdm_ht;
+                struct statistics_rx_phy rx_cck;
+                struct statistics_tx tx;
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+                struct statistics_bt_activity bt_activity;
+                __le32 num_bt_kills, accum_num_bt_kills;
+#endif
+        } statistics;
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+        struct {
+                struct statistics_general_common common;
+                struct statistics_rx_non_phy rx_non_phy;
+                struct statistics_rx_phy rx_ofdm;
+                struct statistics_rx_ht_phy rx_ofdm_ht;
+                struct statistics_rx_phy rx_cck;
+                struct statistics_tx tx;
+                struct statistics_bt_activity bt_activity;
+        } accum_stats, delta_stats, max_delta_stats;
+#endif
+
+        struct {
                 /* INT ICT Table */
                 __le32 *ict_tbl;
                 void *ict_tbl_vir;
@@ -1387,19 +1411,9 @@ struct iwl_priv {
                 u8 phy_calib_chain_noise_reset_cmd;
                 u8 phy_calib_chain_noise_gain_cmd;
 
-                struct iwl_notif_statistics statistics;
-                struct iwl_bt_notif_statistics statistics_bt;
                 /* counts reply_tx error */
                 struct reply_tx_error_statistics reply_tx_stats;
                 struct reply_agg_tx_error_statistics reply_agg_tx_stats;
-#ifdef CONFIG_IWLWIFI_DEBUGFS
-                struct iwl_notif_statistics accum_statistics;
-                struct iwl_notif_statistics delta_statistics;
-                struct iwl_notif_statistics max_delta;
-                struct iwl_bt_notif_statistics accum_statistics_bt;
-                struct iwl_bt_notif_statistics delta_statistics_bt;
-                struct iwl_bt_notif_statistics max_delta_bt;
         bool bt_ch_announce;
         bool bt_full_concurrent;
         bool bt_ant_couple_ok;
-        bool bt_statistics;
         __le32 kill_ack_mask;
         __le32 kill_cts_mask;
         __le16 bt_valid;