1 files changed, 14 insertions, 36 deletions

diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index c3a3082b72e..38e6101190d 100644
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -30,7 +30,7 @@ static ssize_t key_##name##_read(struct file *file,			\
 #define KEY_OPS(name)                                                   \
 static const struct file_operations key_ ##name## _ops = {              \
         .read = key_##name##_read,                                      \
-        .open = simple_open,                                            \
+        .open = mac80211_open_file_generic,                             \
         .llseek = generic_file_llseek,                                  \
 }
 
@@ -45,7 +45,7 @@ static const struct file_operations key_ ##name## _ops = {		\
 #define KEY_CONF_OPS(name)                                              \
 static const struct file_operations key_ ##name## _ops = {              \
         .read = key_conf_##name##_read,                                 \
-        .open = simple_open,                                            \
+        .open = mac80211_open_file_generic,                             \
         .llseek = generic_file_llseek,                                  \
 }
 
@@ -116,7 +116,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf,
                                 size_t count, loff_t *ppos)
 {
         struct ieee80211_key *key = file->private_data;
-        char buf[14*IEEE80211_NUM_TIDS+1], *p = buf;
+        char buf[14*NUM_RX_DATA_QUEUES+1], *p = buf;
         int i, len;
         const u8 *rpn;
 
@@ -126,7 +126,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf,
                 len = scnprintf(buf, sizeof(buf), "\n");
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
-                for (i = 0; i < IEEE80211_NUM_TIDS; i++)
+                for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
                         p += scnprintf(p, sizeof(buf)+buf-p,
                                        "%08x %04x\n",
                                        key->u.tkip.rx[i].iv32,
@@ -134,7 +134,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf,
                 len = p - buf;
                 break;
         case WLAN_CIPHER_SUITE_CCMP:
-                for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {
+                for (i = 0; i < NUM_RX_DATA_QUEUES + 1; i++) {
                         rpn = key->u.ccmp.rx_pn[i];
                         p += scnprintf(p, sizeof(buf)+buf-p,
                                        "%02x%02x%02x%02x%02x%02x\n",
@@ -199,22 +199,6 @@ static ssize_t key_icverrors_read(struct file *file, char __user *userbuf,
 }
 KEY_OPS(icverrors);
 
-static ssize_t key_mic_failures_read(struct file *file, char __user *userbuf,
-                                     size_t count, loff_t *ppos)
-{
-        struct ieee80211_key *key = file->private_data;
-        char buf[20];
-        int len;
-
-        if (key->conf.cipher != WLAN_CIPHER_SUITE_TKIP)
-                return -EINVAL;
-
-        len = scnprintf(buf, sizeof(buf), "%u\n", key->u.tkip.mic_failures);
-
-        return simple_read_from_buffer(userbuf, count, ppos, buf, len);
-}
-KEY_OPS(mic_failures);
-
 static ssize_t key_key_read(struct file *file, char __user *userbuf,
                             size_t count, loff_t *ppos)
 {
@@ -241,9 +225,9 @@ KEY_OPS(key);
                             key, &key_##name##_ops);
 
 void ieee80211_debugfs_key_add(struct ieee80211_key *key)
-{
+  {
         static int keycount;
-        char buf[100];
+        char buf[50];
         struct sta_info *sta;
 
         if (!key->local->debugfs.keys)
@@ -260,8 +244,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key)
 
         sta = key->sta;
         if (sta) {
-                sprintf(buf, "../../netdev:%s/stations/%pM",
-                        sta->sdata->name, sta->sta.addr);
+                sprintf(buf, "../../stations/%pM", sta->sta.addr);
                 key->debugfs.stalink =
                         debugfs_create_symlink("station", key->debugfs.dir, buf);
         }
@@ -276,7 +259,6 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key)
         DEBUGFS_ADD(rx_spec);
         DEBUGFS_ADD(replays);
         DEBUGFS_ADD(icverrors);
-        DEBUGFS_ADD(mic_failures);
         DEBUGFS_ADD(key);
         DEBUGFS_ADD(ifindex);
 };
@@ -300,11 +282,6 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata)
 
         lockdep_assert_held(&sdata->local->key_mtx);
 
-        if (sdata->debugfs.default_unicast_key) {
-                debugfs_remove(sdata->debugfs.default_unicast_key);
-                sdata->debugfs.default_unicast_key = NULL;
-        }
-
         if (sdata->default_unicast_key) {
                 key = key_mtx_dereference(sdata->local,
                                           sdata->default_unicast_key);
@@ -312,11 +289,9 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata)
                 sdata->debugfs.default_unicast_key =
                         debugfs_create_symlink("default_unicast_key",
                                                sdata->debugfs.dir, buf);
-        }
-
-        if (sdata->debugfs.default_multicast_key) {
-                debugfs_remove(sdata->debugfs.default_multicast_key);
-                sdata->debugfs.default_multicast_key = NULL;
+        } else {
+                debugfs_remove(sdata->debugfs.default_unicast_key);
+                sdata->debugfs.default_unicast_key = NULL;
         }
 
         if (sdata->default_multicast_key) {
@@ -326,6 +301,9 @@ void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata)
                 sdata->debugfs.default_multicast_key =
                         debugfs_create_symlink("default_multicast_key",
                                                sdata->debugfs.dir, buf);
+        } else {
+                debugfs_remove(sdata->debugfs.default_multicast_key);
+                sdata->debugfs.default_multicast_key = NULL;
         }
 }