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

[linux-2.6] / net / mac80211 / debugfs_sta.c

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index fc2c1a192ed2c7e016b840bf56eb5d0cc92ee2a9..256ea880d28bbf4dea8982d87da723fb1961efb2 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -169,27 +169,30 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
        p += scnprintf(p, sizeof(buf)+buf-p, "\n RX  :");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-       sta->ampdu_mlme.tid_rx[i].state);
+                       sta->ampdu_mlme.tid_state_rx[i]);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n DTKN:");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                       sta->ampdu_mlme.tid_rx[i].dialog_token);
+                       sta->ampdu_mlme.tid_state_rx[i]?
+                       sta->ampdu_mlme.tid_rx[i]->dialog_token : 0);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n TX  :");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                       sta->ampdu_mlme.tid_tx[i].state);
+                       sta->ampdu_mlme.tid_state_tx[i]);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n DTKN:");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                       sta->ampdu_mlme.tid_tx[i].dialog_token);
+                       sta->ampdu_mlme.tid_state_tx[i]?
+                       sta->ampdu_mlme.tid_tx[i]->dialog_token : 0);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n SSN :");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                       sta->ampdu_mlme.tid_tx[i].ssn);
+                       sta->ampdu_mlme.tid_state_tx[i]?
+                       sta->ampdu_mlme.tid_tx[i]->ssn : 0);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n");
 
@@ -230,11 +233,13 @@ static ssize_t sta_agg_status_write(struct file *file,
                        strcpy(state, "off ");
                        ieee80211_sta_stop_rx_ba_session(dev, da, tid_num, 0,
                                        WLAN_REASON_QSTA_REQUIRE_SETUP);
-                       sta->ampdu_mlme.tid_rx[tid_num].buf_size = 0xFF;
+                       sta->ampdu_mlme.tid_state_rx[tid_num] |=
+                                       HT_AGG_STATE_DEBUGFS_CTL;
                        tid_static_rx[tid_num] = 0;
                } else {
                        strcpy(state, "on ");
-                       sta->ampdu_mlme.tid_rx[tid_num].buf_size = 0x00;
+                       sta->ampdu_mlme.tid_state_rx[tid_num] &=
+                                       ~HT_AGG_STATE_DEBUGFS_CTL;
                        tid_static_rx[tid_num] = 1;
                }
                printk(KERN_DEBUG "debugfs - try switching tid %u %s\n",