1 files changed, 132 insertions, 70 deletions

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 96991b68f048..637929b65ccc 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -1,3 +1,4 @@
+
 /*
  * mac80211 debugfs for wireless PHYs
  *
@@ -38,16 +39,10 @@ static const struct file_operations name## _ops = {			\
 };
 
 #define DEBUGFS_ADD(name)                                               \
-        local->debugfs.name = debugfs_create_file(#name, 0400, phyd,    \
-                                                  local, &name## _ops);
+        debugfs_create_file(#name, 0400, phyd, local, &name## _ops);
 
 #define DEBUGFS_ADD_MODE(name, mode)                                    \
-        local->debugfs.name = debugfs_create_file(#name, mode, phyd,    \
-                                                  local, &name## _ops);
-
-#define DEBUGFS_DEL(name)                                               \
-        debugfs_remove(local->debugfs.name);                            \
-        local->debugfs.name = NULL;
+        debugfs_create_file(#name, mode, phyd, local, &name## _ops);
 
 
 DEBUGFS_READONLY_FILE(frequency, 20, "%d",
@@ -57,7 +52,7 @@ DEBUGFS_READONLY_FILE(total_ps_buffered, 20, "%d",
 DEBUGFS_READONLY_FILE(wep_iv, 20, "%#08x",
                       local->wep_iv & 0xffffff);
 DEBUGFS_READONLY_FILE(rate_ctrl_alg, 100, "%s",
-                      local->rate_ctrl ? local->rate_ctrl->ops->name : "<unset>");
+        local->rate_ctrl ? local->rate_ctrl->ops->name : "hw/driver");
 
 static ssize_t tsf_read(struct file *file, char __user *user_buf,
                              size_t count, loff_t *ppos)
@@ -163,6 +158,130 @@ static const struct file_operations noack_ops = {
         .open = mac80211_open_file_generic
 };
 
+static ssize_t uapsd_queues_read(struct file *file, char __user *user_buf,
+                                 size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        int res;
+        char buf[10];
+
+        res = scnprintf(buf, sizeof(buf), "0x%x\n", local->uapsd_queues);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, res);
+}
+
+static ssize_t uapsd_queues_write(struct file *file,
+                                  const char __user *user_buf,
+                                  size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        unsigned long val;
+        char buf[10];
+        size_t len;
+        int ret;
+
+        len = min(count, sizeof(buf) - 1);
+        if (copy_from_user(buf, user_buf, len))
+                return -EFAULT;
+        buf[len] = '\0';
+
+        ret = strict_strtoul(buf, 0, &val);
+
+        if (ret)
+                return -EINVAL;
+
+        if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)
+                return -ERANGE;
+
+        local->uapsd_queues = val;
+
+        return count;
+}
+
+static const struct file_operations uapsd_queues_ops = {
+        .read = uapsd_queues_read,
+        .write = uapsd_queues_write,
+        .open = mac80211_open_file_generic
+};
+
+static ssize_t uapsd_max_sp_len_read(struct file *file, char __user *user_buf,
+                                     size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        int res;
+        char buf[10];
+
+        res = scnprintf(buf, sizeof(buf), "0x%x\n", local->uapsd_max_sp_len);
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, res);
+}
+
+static ssize_t uapsd_max_sp_len_write(struct file *file,
+                                      const char __user *user_buf,
+                                      size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        unsigned long val;
+        char buf[10];
+        size_t len;
+        int ret;
+
+        len = min(count, sizeof(buf) - 1);
+        if (copy_from_user(buf, user_buf, len))
+                return -EFAULT;
+        buf[len] = '\0';
+
+        ret = strict_strtoul(buf, 0, &val);
+
+        if (ret)
+                return -EINVAL;
+
+        if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_SP_MASK)
+                return -ERANGE;
+
+        local->uapsd_max_sp_len = val;
+
+        return count;
+}
+
+static const struct file_operations uapsd_max_sp_len_ops = {
+        .read = uapsd_max_sp_len_read,
+        .write = uapsd_max_sp_len_write,
+        .open = mac80211_open_file_generic
+};
+
+static ssize_t channel_type_read(struct file *file, char __user *user_buf,
+                       size_t count, loff_t *ppos)
+{
+        struct ieee80211_local *local = file->private_data;
+        const char *buf;
+
+        switch (local->hw.conf.channel_type) {
+        case NL80211_CHAN_NO_HT:
+                buf = "no ht\n";
+                break;
+        case NL80211_CHAN_HT20:
+                buf = "ht20\n";
+                break;
+        case NL80211_CHAN_HT40MINUS:
+                buf = "ht40-\n";
+                break;
+        case NL80211_CHAN_HT40PLUS:
+                buf = "ht40+\n";
+                break;
+        default:
+                buf = "???";
+                break;
+        }
+
+        return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
+}
+
+static const struct file_operations channel_type_ops = {
+        .read = channel_type_read,
+        .open = mac80211_open_file_generic
+};
+
 static ssize_t queues_read(struct file *file, char __user *user_buf,
                            size_t count, loff_t *ppos)
 {
@@ -233,12 +352,7 @@ static const struct file_operations stats_ ##name## _ops = {		\
 };
 
 #define DEBUGFS_STATS_ADD(name)                                         \
-        local->debugfs.stats.name = debugfs_create_file(#name, 0400, statsd,\
-                local, &stats_ ##name## _ops);
-
-#define DEBUGFS_STATS_DEL(name)                                         \
-        debugfs_remove(local->debugfs.stats.name);                      \
-        local->debugfs.stats.name = NULL;
+        debugfs_create_file(#name, 0400, statsd, local, &stats_ ##name## _ops);
 
 DEBUGFS_STATS_FILE(transmitted_fragment_count, 20, "%u",
                    local->dot11TransmittedFragmentCount);
@@ -324,9 +438,11 @@ void debugfs_hw_add(struct ieee80211_local *local)
         DEBUGFS_ADD(queues);
         DEBUGFS_ADD_MODE(reset, 0200);
         DEBUGFS_ADD(noack);
+        DEBUGFS_ADD(uapsd_queues);
+        DEBUGFS_ADD(uapsd_max_sp_len);
+        DEBUGFS_ADD(channel_type);
 
         statsd = debugfs_create_dir("statistics", phyd);
-        local->debugfs.statistics = statsd;
 
         /* if the dir failed, don't put all the other things into the root! */
         if (!statsd)
@@ -367,57 +483,3 @@ void debugfs_hw_add(struct ieee80211_local *local)
         DEBUGFS_STATS_ADD(dot11FCSErrorCount);
         DEBUGFS_STATS_ADD(dot11RTSSuccessCount);
 }
-
-void debugfs_hw_del(struct ieee80211_local *local)
-{
-        DEBUGFS_DEL(frequency);
-        DEBUGFS_DEL(total_ps_buffered);
-        DEBUGFS_DEL(wep_iv);
-        DEBUGFS_DEL(tsf);
-        DEBUGFS_DEL(queues);
-        DEBUGFS_DEL(reset);
-        DEBUGFS_DEL(noack);
-
-        DEBUGFS_STATS_DEL(transmitted_fragment_count);
-        DEBUGFS_STATS_DEL(multicast_transmitted_frame_count);
-        DEBUGFS_STATS_DEL(failed_count);
-        DEBUGFS_STATS_DEL(retry_count);
-        DEBUGFS_STATS_DEL(multiple_retry_count);
-        DEBUGFS_STATS_DEL(frame_duplicate_count);
-        DEBUGFS_STATS_DEL(received_fragment_count);
-        DEBUGFS_STATS_DEL(multicast_received_frame_count);
-        DEBUGFS_STATS_DEL(transmitted_frame_count);
-        DEBUGFS_STATS_DEL(num_scans);
-#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
-        DEBUGFS_STATS_DEL(tx_handlers_drop);
-        DEBUGFS_STATS_DEL(tx_handlers_queued);
-        DEBUGFS_STATS_DEL(tx_handlers_drop_unencrypted);
-        DEBUGFS_STATS_DEL(tx_handlers_drop_fragment);
-        DEBUGFS_STATS_DEL(tx_handlers_drop_wep);
-        DEBUGFS_STATS_DEL(tx_handlers_drop_not_assoc);
-        DEBUGFS_STATS_DEL(tx_handlers_drop_unauth_port);
-        DEBUGFS_STATS_DEL(rx_handlers_drop);
-        DEBUGFS_STATS_DEL(rx_handlers_queued);
-        DEBUGFS_STATS_DEL(rx_handlers_drop_nullfunc);
-        DEBUGFS_STATS_DEL(rx_handlers_drop_defrag);
-        DEBUGFS_STATS_DEL(rx_handlers_drop_short);
-        DEBUGFS_STATS_DEL(rx_handlers_drop_passive_scan);
-        DEBUGFS_STATS_DEL(tx_expand_skb_head);
-        DEBUGFS_STATS_DEL(tx_expand_skb_head_cloned);
-        DEBUGFS_STATS_DEL(rx_expand_skb_head);
-        DEBUGFS_STATS_DEL(rx_expand_skb_head2);
-        DEBUGFS_STATS_DEL(rx_handlers_fragments);
-        DEBUGFS_STATS_DEL(tx_status_drop);
-#endif
-        DEBUGFS_STATS_DEL(dot11ACKFailureCount);
-        DEBUGFS_STATS_DEL(dot11RTSFailureCount);
-        DEBUGFS_STATS_DEL(dot11FCSErrorCount);
-        DEBUGFS_STATS_DEL(dot11RTSSuccessCount);
-
-        debugfs_remove(local->debugfs.statistics);
-        local->debugfs.statistics = NULL;
-        debugfs_remove(local->debugfs.stations);
-        local->debugfs.stations = NULL;
-        debugfs_remove(local->debugfs.keys);
-        local->debugfs.keys = NULL;
-}