Upgrade b43 and mac80211.
[openwrt/staging/lynxis/omap.git] / package / mac80211 / src / net / mac80211 / debugfs_sta.c
index 4ea0ea7ea040421583c6193553995359f46aa66e..ac61353ae7cedde1e2682629bc9d21da5b8cd00c 100644 (file)
@@ -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,                             \
 }
 
@@ -70,8 +61,6 @@ 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);
@@ -85,12 +74,11 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
 {
        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%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" : "",
@@ -191,6 +179,113 @@ 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_rx[i].state);
+
+       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);
+
+       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);
+
+       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);
+
+       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);
+
+       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->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_rx[tid_num].buf_size = 0xFF;
+                       tid_static_rx[tid_num] = 0;
+               } else {
+                       strcpy(state, "on ");
+                       sta->ampdu_mlme.tid_rx[tid_num].buf_size = 0x00;
+                       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.dir, sta, &sta_ ##name## _ops);
@@ -202,15 +297,15 @@ STA_OPS(wme_tx_queue);
 
 void ieee80211_sta_debugfs_add(struct sta_info *sta)
 {
-       char buf[3*6];
        struct dentry *stations_dir = sta->local->debugfs.stations;
+       DECLARE_MAC_BUF(mac);
 
        if (!stations_dir)
                return;
 
-       sprintf(buf, MAC_FMT, MAC_ARG(sta->addr));
+       print_mac(mac, sta->addr);
 
-       sta->debugfs.dir = debugfs_create_dir(buf, stations_dir);
+       sta->debugfs.dir = debugfs_create_dir(mac, stations_dir);
        if (!sta->debugfs.dir)
                return;
 
@@ -224,6 +319,7 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta)
        DEBUGFS_ADD(wme_rx_queue);
        DEBUGFS_ADD(wme_tx_queue);
 #endif
+       DEBUGFS_ADD(agg_status);
 }
 
 void ieee80211_sta_debugfs_remove(struct sta_info *sta)
@@ -238,6 +334,7 @@ void ieee80211_sta_debugfs_remove(struct sta_info *sta)
        DEBUGFS_DEL(wme_rx_queue);
        DEBUGFS_DEL(wme_tx_queue);
 #endif
+       DEBUGFS_DEL(agg_status);
 
        debugfs_remove(sta->debugfs.dir);
        sta->debugfs.dir = NULL;