1 files changed, 127 insertions, 54 deletions

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 8f5944c53d4e..6d47a1d31b37 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -33,25 +33,16 @@ static ssize_t sta_ ##name## _read(struct file *file,			\
 #define STA_READ_LU(name, field) STA_READ(name, 20, field, "%lu\n")
 #define STA_READ_S(name, field) STA_READ(name, 20, field, "%s\n")
 
-#define STA_READ_RATE(name, field)                                      \
-static ssize_t sta_##name##_read(struct file *file,                     \
-                                 char __user *userbuf,                  \
-                                 size_t count, loff_t *ppos)            \
-{                                                                       \
-        struct sta_info *sta = file->private_data;                      \
-        struct ieee80211_local *local = wdev_priv(sta->dev->ieee80211_ptr);\
-        struct ieee80211_hw_mode *mode = local->oper_hw_mode;           \
-        char buf[20];                                                   \
-        int res = scnprintf(buf, sizeof(buf), "%d\n",                   \
-                            (sta->field >= 0 &&                         \
-                            sta->field < mode->num_rates) ?             \
-                            mode->rates[sta->field].rate : -1);         \
-        return simple_read_from_buffer(userbuf, count, ppos, buf, res); \
+#define STA_OPS(name)                                                   \
+static const struct file_operations sta_ ##name## _ops = {              \
+        .read = sta_##name##_read,                                      \
+        .open = mac80211_open_file_generic,                             \
 }
 
-#define STA_OPS(name)                                                   \
+#define STA_OPS_WR(name)                                                \
 static const struct file_operations sta_ ##name## _ops = {              \
         .read = sta_##name##_read,                                      \
+        .write = sta_##name##_write,                                    \
         .open = mac80211_open_file_generic,                             \
 }
 
@@ -60,7 +51,7 @@ static const struct file_operations sta_ ##name## _ops = {		\
                 STA_OPS(name)
 
 STA_FILE(aid, aid, D);
-STA_FILE(dev, dev->name, S);
+STA_FILE(dev, sdata->dev->name, S);
 STA_FILE(rx_packets, rx_packets, LU);
 STA_FILE(tx_packets, tx_packets, LU);
 STA_FILE(rx_bytes, rx_bytes, LU);
@@ -70,27 +61,23 @@ STA_FILE(rx_fragments, rx_fragments, LU);
 STA_FILE(rx_dropped, rx_dropped, LU);
 STA_FILE(tx_fragments, tx_fragments, LU);
 STA_FILE(tx_filtered, tx_filtered_count, LU);
-STA_FILE(txrate, txrate, RATE);
-STA_FILE(last_txrate, last_txrate, RATE);
 STA_FILE(tx_retry_failed, tx_retry_failed, LU);
 STA_FILE(tx_retry_count, tx_retry_count, LU);
 STA_FILE(last_rssi, last_rssi, D);
 STA_FILE(last_signal, last_signal, D);
 STA_FILE(last_noise, last_noise, D);
 STA_FILE(channel_use, channel_use, D);
-STA_FILE(wep_weak_iv_count, wep_weak_iv_count, D);
+STA_FILE(wep_weak_iv_count, wep_weak_iv_count, LU);
 
 static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
                               size_t count, loff_t *ppos)
 {
         char buf[100];
         struct sta_info *sta = file->private_data;
-        int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
+        int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s",
                 sta->flags & WLAN_STA_AUTH ? "AUTH\n" : "",
                 sta->flags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
                 sta->flags & WLAN_STA_PS ? "PS\n" : "",
-                sta->flags & WLAN_STA_TIM ? "TIM\n" : "",
-                sta->flags & WLAN_STA_PERM ? "PERM\n" : "",
                 sta->flags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
                 sta->flags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
                 sta->flags & WLAN_STA_WME ? "WME\n" : "",
@@ -111,31 +98,6 @@ static ssize_t sta_num_ps_buf_frames_read(struct file *file,
 }
 STA_OPS(num_ps_buf_frames);
 
-static ssize_t sta_last_ack_rssi_read(struct file *file, char __user *userbuf,
-                                      size_t count, loff_t *ppos)
-{
-        char buf[100];
-        struct sta_info *sta = file->private_data;
-        int res = scnprintf(buf, sizeof(buf), "%d %d %d\n",
-                            sta->last_ack_rssi[0],
-                            sta->last_ack_rssi[1],
-                            sta->last_ack_rssi[2]);
-        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
-}
-STA_OPS(last_ack_rssi);
-
-static ssize_t sta_last_ack_ms_read(struct file *file, char __user *userbuf,
-                                    size_t count, loff_t *ppos)
-{
-        char buf[20];
-        struct sta_info *sta = file->private_data;
-        int res = scnprintf(buf, sizeof(buf), "%d\n",
-                            sta->last_ack ?
-                            jiffies_to_msecs(jiffies - sta->last_ack) : -1);
-        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
-}
-STA_OPS(last_ack_ms);
-
 static ssize_t sta_inactive_ms_read(struct file *file, char __user *userbuf,
                                     size_t count, loff_t *ppos)
 {
@@ -191,8 +153,120 @@ static ssize_t sta_wme_tx_queue_read(struct file *file, char __user *userbuf,
 STA_OPS(wme_tx_queue);
 #endif
 
+static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
+                                        size_t count, loff_t *ppos)
+{
+        char buf[768], *p = buf;
+        int i;
+        struct sta_info *sta = file->private_data;
+        p += scnprintf(p, sizeof(buf)+buf-p, "Agg state for STA is:\n");
+        p += scnprintf(p, sizeof(buf)+buf-p, " STA next dialog_token is %d \n "
+                        "TIDs info is: \n TID :",
+                        (sta->ampdu_mlme.dialog_token_allocator + 1));
+        for (i = 0; i < STA_TID_NUM; i++)
+                p += scnprintf(p, sizeof(buf)+buf-p, "%5d", i);
+
+        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_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_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_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_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_state_tx[i]?
+                        sta->ampdu_mlme.tid_tx[i]->ssn : 0);
+
+        p += scnprintf(p, sizeof(buf)+buf-p, "\n");
+
+        return simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
+}
+
+static ssize_t sta_agg_status_write(struct file *file,
+                const char __user *user_buf, size_t count, loff_t *ppos)
+{
+        struct sta_info *sta = file->private_data;
+        struct net_device *dev = sta->sdata->dev;
+        struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+        struct ieee80211_hw *hw = &local->hw;
+        u8 *da = sta->addr;
+        static int tid_static_tx[16] = {0, 0, 0, 0, 0, 0, 0, 0,
+                                        0, 0, 0, 0, 0, 0, 0, 0};
+        static int tid_static_rx[16] = {1, 1, 1, 1, 1, 1, 1, 1,
+                                        1, 1, 1, 1, 1, 1, 1, 1};
+        char *endp;
+        char buf[32];
+        int buf_size, rs;
+        unsigned int tid_num;
+        char state[4];
+
+        memset(buf, 0x00, sizeof(buf));
+        buf_size = min(count, (sizeof(buf)-1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+
+        tid_num = simple_strtoul(buf, &endp, 0);
+        if (endp == buf)
+                return -EINVAL;
+
+        if ((tid_num >= 100) && (tid_num <= 115)) {
+                /* toggle Rx aggregation command */
+                tid_num = tid_num - 100;
+                if (tid_static_rx[tid_num] == 1) {
+                        strcpy(state, "off ");
+                        ieee80211_sta_stop_rx_ba_session(dev, da, tid_num, 0,
+                                        WLAN_REASON_QSTA_REQUIRE_SETUP);
+                        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_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",
+                                tid_num, state);
+        } else if ((tid_num >= 0) && (tid_num <= 15)) {
+                /* toggle Tx aggregation command */
+                if (tid_static_tx[tid_num] == 0) {
+                        strcpy(state, "on ");
+                        rs =  ieee80211_start_tx_ba_session(hw, da, tid_num);
+                        if (rs == 0)
+                                tid_static_tx[tid_num] = 1;
+                } else {
+                        strcpy(state, "off");
+                        rs =  ieee80211_stop_tx_ba_session(hw, da, tid_num, 1);
+                        if (rs == 0)
+                                tid_static_tx[tid_num] = 0;
+                }
+                printk(KERN_DEBUG "debugfs - switching tid %u %s, return=%d\n",
+                                tid_num, state, rs);
+        }
+
+        return count;
+}
+STA_OPS_WR(agg_status);
+
 #define DEBUGFS_ADD(name) \
-        sta->debugfs.name = debugfs_create_file(#name, 0444, \
+        sta->debugfs.name = debugfs_create_file(#name, 0400, \
                 sta->debugfs.dir, sta, &sta_ ##name## _ops);
 
 #define DEBUGFS_DEL(name) \
@@ -203,12 +277,13 @@ STA_OPS(wme_tx_queue);
 void ieee80211_sta_debugfs_add(struct sta_info *sta)
 {
         struct dentry *stations_dir = sta->local->debugfs.stations;
-        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mbuf);
+        u8 *mac;
 
         if (!stations_dir)
                 return;
 
-        print_mac(mac, sta->addr);
+        mac = print_mac(mbuf, sta->addr);
 
         sta->debugfs.dir = debugfs_create_dir(mac, stations_dir);
         if (!sta->debugfs.dir)
@@ -216,28 +291,26 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
 
         DEBUGFS_ADD(flags);
         DEBUGFS_ADD(num_ps_buf_frames);
-        DEBUGFS_ADD(last_ack_rssi);
-        DEBUGFS_ADD(last_ack_ms);
         DEBUGFS_ADD(inactive_ms);
         DEBUGFS_ADD(last_seq_ctrl);
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
         DEBUGFS_ADD(wme_rx_queue);
         DEBUGFS_ADD(wme_tx_queue);
 #endif
+        DEBUGFS_ADD(agg_status);
 }
 
 void ieee80211_sta_debugfs_remove(struct sta_info *sta)
 {
         DEBUGFS_DEL(flags);
         DEBUGFS_DEL(num_ps_buf_frames);
-        DEBUGFS_DEL(last_ack_rssi);
-        DEBUGFS_DEL(last_ack_ms);
         DEBUGFS_DEL(inactive_ms);
         DEBUGFS_DEL(last_seq_ctrl);
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
         DEBUGFS_DEL(wme_rx_queue);
         DEBUGFS_DEL(wme_tx_queue);
 #endif
+        DEBUGFS_DEL(agg_status);
 
         debugfs_remove(sta->debugfs.dir);
         sta->debugfs.dir = NULL;