Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / net / mac80211 / sta_info.h

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index f26e1c294395f1e874fcb0f8da7ebb9e17e6090d..b5591d2f60a4fcef8032bb1cd78a09fe1997c1da 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -98,6 +98,9 @@ struct sta_info {
                                  * filtering; used only if sta->key is not
                                  * set */
 
+#ifdef CONFIG_MAC80211_DEBUGFS
+       int debugfs_registered;
+#endif
        int assoc_ap; /* whether this is an AP that we are
                       * associated with as a client */
 
@@ -109,6 +112,22 @@ struct sta_info {
        int vlan_id;
 
        u16 listen_interval;
+
+#ifdef CONFIG_MAC80211_DEBUGFS
+       struct sta_info_debugfsdentries {
+               struct dentry *dir;
+               struct dentry *flags;
+               struct dentry *num_ps_buf_frames;
+               struct dentry *last_ack_rssi;
+               struct dentry *last_ack_ms;
+               struct dentry *inactive_ms;
+               struct dentry *last_seq_ctrl;
+#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
+               struct dentry *wme_rx_queue;
+               struct dentry *wme_tx_queue;
+#endif
+       } debugfs;
+#endif
 };