Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/ath/ath9k/hw.c

1 files changed, 0 insertions, 81 deletions

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 483e96ed95c1..cc5b7a6e7e0b 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -97,85 +97,6 @@ static const struct file_operations reset_ops = {
         .llseek = noop_llseek,
 };
 
-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;
-        return mac80211_format_buffer(user_buf, count, ppos, "0x%x\n",
-                                      local->uapsd_queues);
-}
-
-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;
-        u8 val;
-        int ret;
-
-        ret = kstrtou8_from_user(user_buf, count, 0, &val);
-        if (ret)
-                return ret;
-
-        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,
-        .llseek = default_llseek,
-};
-
-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;
-
-        return mac80211_format_buffer(user_buf, count, ppos, "0x%x\n",
-                                      local->uapsd_max_sp_len);
-}
-
-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 = kstrtoul(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,
-        .llseek = default_llseek,
-};
-
 static ssize_t channel_type_read(struct file *file, char __user *user_buf,
                        size_t count, loff_t *ppos)
 {
@@ -362,8 +283,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
         DEBUGFS_ADD(wep_iv);
         DEBUGFS_ADD(queues);
         DEBUGFS_ADD_MODE(reset, 0200);
-        DEBUGFS_ADD(uapsd_queues);
-        DEBUGFS_ADD(uapsd_max_sp_len);
         DEBUGFS_ADD(channel_type);
         DEBUGFS_ADD(hwflags);
         DEBUGFS_ADD(user_power);