Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[linux-2.6-block.git] / net / mac80211 / rc80211_minstrel_ht.h

diff --git a/net/mac80211/rc80211_minstrel_ht.h b/net/mac80211/rc80211_minstrel_ht.h
index f2217d6aa0c2ee28b158616711b99895b250df44..e8b52a94d24b64fd3e78b4d3a390c3dbdad9e328 100644 (file)
--- a/net/mac80211/rc80211_minstrel_ht.h
+++ b/net/mac80211/rc80211_minstrel_ht.h
@@ -78,7 +78,7 @@ struct minstrel_ht_sta {
        u16 max_prob_rate;
 
        /* time of last status update */
-       unsigned long stats_update;
+       unsigned long last_stats_update;
 
        /* overhead time in usec for each frame */
        unsigned int overhead;
@@ -112,6 +112,7 @@ struct minstrel_ht_sta_priv {
        };
 #ifdef CONFIG_MAC80211_DEBUGFS
        struct dentry *dbg_stats;
+       struct dentry *dbg_stats_csv;
 #endif
        void *ratelist;
        void *sample_table;
@@ -120,5 +121,7 @@ struct minstrel_ht_sta_priv {
 
 void minstrel_ht_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
 void minstrel_ht_remove_sta_debugfs(void *priv, void *priv_sta);
+int minstrel_ht_get_tp_avg(struct minstrel_ht_sta *mi, int group, int rate,
+                          int prob_ewma);
 
 #endif