mac80211: move averaged values out of rx_stats

[cascardo/linux.git] / net / mac80211 / sta_info.h

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 053f5c4..93dc567 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -69,6 +69,8 @@
  * @WLAN_STA_MPSP_RECIPIENT: local STA is recipient of a MPSP.
  * @WLAN_STA_PS_DELIVER: station woke up, but we're still blocking TX
  *     until pending frames are delivered
+ *
+ * @NUM_WLAN_STA_FLAGS: number of defined flags
  */
 enum ieee80211_sta_info_flags {
        WLAN_STA_AUTH,
@@ -97,6 +99,8 @@ enum ieee80211_sta_info_flags {
        WLAN_STA_MPSP_OWNER,
        WLAN_STA_MPSP_RECIPIENT,
        WLAN_STA_PS_DELIVER,
+
+       NUM_WLAN_STA_FLAGS,
 };
 
 #define ADDBA_RESP_INTERVAL HZ
@@ -371,7 +375,7 @@ DECLARE_EWMA(signal, 1024, 8)
  * @ampdu_mlme: A-MPDU state machine state
  * @timer_to_tid: identity mapping to ID timers
  * @mesh: mesh STA information
- * @debugfs: debug filesystem info
+ * @debugfs_dir: debug filesystem directory dentry
  * @dead: set to true when sta is unlinked
  * @removed: set to true when sta is being removed from sta_list
  * @uploaded: set to true when sta is uploaded to the driver
@@ -446,16 +450,18 @@ struct sta_info {
                unsigned long fragments;
                unsigned long dropped;
                int last_signal;
-               struct ewma_signal avg_signal;
                u8 chains;
                s8 chain_signal_last[IEEE80211_MAX_CHAINS];
-               struct ewma_signal chain_signal_avg[IEEE80211_MAX_CHAINS];
                int last_rate_idx;
                u32 last_rate_flag;
                u32 last_rate_vht_flag;
                u8 last_rate_vht_nss;
                u64 msdu[IEEE80211_NUM_TIDS + 1];
        } rx_stats;
+       struct {
+               struct ewma_signal signal;
+               struct ewma_signal chain_signal[IEEE80211_MAX_CHAINS];
+       } rx_stats_avg;
 
        /* Plus 1 for non-QoS frames */
        __le16 last_seq_ctrl[IEEE80211_NUM_TIDS + 1];
@@ -486,10 +492,7 @@ struct sta_info {
        u8 timer_to_tid[IEEE80211_NUM_TIDS];
 
 #ifdef CONFIG_MAC80211_DEBUGFS
-       struct sta_info_debugfsdentries {
-               struct dentry *dir;
-               bool add_has_run;
-       } debugfs;
+       struct dentry *debugfs_dir;
 #endif
 
        enum ieee80211_sta_rx_bandwidth cur_max_bandwidth;