1 files changed, 32 insertions, 17 deletions

diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index 077f907271cf..246938c32d4d 100644
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -14,17 +14,17 @@
 #include "debugfs.h"
 #include "debugfs_key.h"
 
-#define KEY_READ(name, buflen, format_string)                           \
+#define KEY_READ(name, prop, buflen, format_string)                     \
 static ssize_t key_##name##_read(struct file *file,                     \
                                  char __user *userbuf,                  \
                                  size_t count, loff_t *ppos)            \
 {                                                                       \
         char buf[buflen];                                               \
         struct ieee80211_key *key = file->private_data;                 \
-        int res = scnprintf(buf, buflen, format_string, key->name);     \
+        int res = scnprintf(buf, buflen, format_string, key->prop);     \
         return simple_read_from_buffer(userbuf, count, ppos, buf, res); \
 }
-#define KEY_READ_D(name) KEY_READ(name, 20, "%d\n")
+#define KEY_READ_D(name) KEY_READ(name, name, 20, "%d\n")
 
 #define KEY_OPS(name)                                                   \
 static const struct file_operations key_ ##name## _ops = {              \
@@ -36,10 +36,25 @@ static const struct file_operations key_ ##name## _ops = {		\
                  KEY_READ_##format(name)                                \
                  KEY_OPS(name)
 
-KEY_FILE(keylen, D);
-KEY_FILE(force_sw_encrypt, D);
-KEY_FILE(keyidx, D);
-KEY_FILE(hw_key_idx, D);
+#define KEY_CONF_READ(name, buflen, format_string)                      \
+        KEY_READ(conf_##name, conf.name, buflen, format_string)
+#define KEY_CONF_READ_D(name) KEY_CONF_READ(name, 20, "%d\n")
+#define KEY_CONF_READ_X(name) KEY_CONF_READ(name, 20, "0x%x\n")
+
+#define KEY_CONF_OPS(name)                                              \
+static const struct file_operations key_ ##name## _ops = {              \
+        .read = key_conf_##name##_read,                                 \
+        .open = mac80211_open_file_generic,                             \
+}
+
+#define KEY_CONF_FILE(name, format)                                     \
+                 KEY_CONF_READ_##format(name)                           \
+                 KEY_CONF_OPS(name)
+
+KEY_CONF_FILE(keylen, D);
+KEY_CONF_FILE(keyidx, D);
+KEY_CONF_FILE(hw_key_idx, D);
+KEY_CONF_FILE(flags, X);
 KEY_FILE(tx_rx_count, D);
 
 static ssize_t key_algorithm_read(struct file *file,
@@ -49,7 +64,7 @@ static ssize_t key_algorithm_read(struct file *file,
         char *alg;
         struct ieee80211_key *key = file->private_data;
 
-        switch (key->alg) {
+        switch (key->conf.alg) {
         case ALG_WEP:
                 alg = "WEP\n";
                 break;
@@ -74,7 +89,7 @@ static ssize_t key_tx_spec_read(struct file *file, char __user *userbuf,
         int len;
         struct ieee80211_key *key = file->private_data;
 
-        switch (key->alg) {
+        switch (key->conf.alg) {
         case ALG_WEP:
                 len = scnprintf(buf, sizeof(buf), "\n");
                 break;
@@ -103,7 +118,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf,
         int i, len;
         const u8 *rpn;
 
-        switch (key->alg) {
+        switch (key->conf.alg) {
         case ALG_WEP:
                 len = scnprintf(buf, sizeof(buf), "\n");
                 break;
@@ -139,7 +154,7 @@ static ssize_t key_replays_read(struct file *file, char __user *userbuf,
         char buf[20];
         int len;
 
-        if (key->alg != ALG_CCMP)
+        if (key->conf.alg != ALG_CCMP)
                 return 0;
         len = scnprintf(buf, sizeof(buf), "%u\n", key->u.ccmp.replays);
         return simple_read_from_buffer(userbuf, count, ppos, buf, len);
@@ -150,12 +165,12 @@ static ssize_t key_key_read(struct file *file, char __user *userbuf,
                             size_t count, loff_t *ppos)
 {
         struct ieee80211_key *key = file->private_data;
-        int i, res, bufsize = 2*key->keylen+2;
+        int i, res, bufsize = 2 * key->conf.keylen + 2;
         char *buf = kmalloc(bufsize, GFP_KERNEL);
         char *p = buf;
 
-        for (i = 0; i < key->keylen; i++)
-                p += scnprintf(p, bufsize+buf-p, "%02x", key->key[i]);
+        for (i = 0; i < key->conf.keylen; i++)
+                p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
         p += scnprintf(p, bufsize+buf-p, "\n");
         res = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf);
         kfree(buf);
@@ -185,7 +200,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_local *local,
                 return;
 
         DEBUGFS_ADD(keylen);
-        DEBUGFS_ADD(force_sw_encrypt);
+        DEBUGFS_ADD(flags);
         DEBUGFS_ADD(keyidx);
         DEBUGFS_ADD(hw_key_idx);
         DEBUGFS_ADD(tx_rx_count);
@@ -205,7 +220,7 @@ void ieee80211_debugfs_key_remove(struct ieee80211_key *key)
                 return;
 
         DEBUGFS_DEL(keylen);
-        DEBUGFS_DEL(force_sw_encrypt);
+        DEBUGFS_DEL(flags);
         DEBUGFS_DEL(keyidx);
         DEBUGFS_DEL(hw_key_idx);
         DEBUGFS_DEL(tx_rx_count);
@@ -227,7 +242,7 @@ void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata)
         if (!sdata->debugfsdir)
                 return;
 
-        sprintf(buf, "../keys/%d", sdata->default_key->keyidx);
+        sprintf(buf, "../keys/%d", sdata->default_key->conf.keyidx);
         sdata->debugfs.default_key =
                 debugfs_create_symlink("default_key", sdata->debugfsdir, buf);
 }