[PATCH 10/14] d80211: fix "iwconfig key [x]" behavior

[Jiri Benc]

From: Hong Liu <[EMAIL PROTECTED]>

"iwconfig key [x]" behavior is not correctly handled in the stack, also
modify the giwencode method to show the key info.

Signed-off-by: Hong Liu <[EMAIL PROTECTED]>
Signed-off-by: Jiri Benc <[EMAIL PROTECTED]>

---

 net/d80211/ieee80211_ioctl.c |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

ad8c3766f67df906ff45143d393c924ad7297471
diff --git a/net/d80211/ieee80211_ioctl.c b/net/d80211/ieee80211_ioctl.c
index 34fdf40..b47a014 100644
--- a/net/d80211/ieee80211_ioctl.c
+++ b/net/d80211/ieee80211_ioctl.c
@@ -2867,9 +2867,10 @@ static int ieee80211_ioctl_siwencode(str
                if (!sdata->default_key)
                        idx = 0;
                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
-                       if (sdata->default_key == sdata->keys[i])
+                       if (sdata->default_key == sdata->keys[i]) {
                                idx = i;
-                       break;
+                               break;
+                       }
                }
                if (idx < 0)
                        return -EINVAL;
@@ -2880,16 +2881,21 @@ static int ieee80211_ioctl_siwencode(str
                alg = ALG_NONE;
        else if (erq->length == 0) {
                /* No key data - just set the default TX key index */
-               sdata->default_key = sdata->keys[idx];
+               if (sdata->default_key != sdata->keys[idx]) {
+                       if (sdata->default_key)
+                               ieee80211_key_sysfs_remove_default(sdata);
+                       sdata->default_key = sdata->keys[idx];
+                       if (sdata->default_key)
+                               ieee80211_key_sysfs_add_default(sdata);
+               }
+               return 0;
        }
 
        return ieee80211_set_encryption(
                dev, bcaddr,
-               idx, erq->length == 0 ? ALG_NONE : ALG_WEP,
+               idx, alg,
                !sdata->default_key,
                NULL, keybuf, erq->length);
-
-       return 0;
 }
 
 
@@ -2908,9 +2914,10 @@ static int ieee80211_ioctl_giwencode(str
                if (!sdata->default_key)
                        idx = 0;
                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
-                       if (sdata->default_key == sdata->keys[i])
+                       if (sdata->default_key == sdata->keys[i]) {
                                idx = i;
-                       break;
+                               break;
+                       }
                }
                if (idx < 0)
                        return -EINVAL;
@@ -2925,7 +2932,9 @@ static int ieee80211_ioctl_giwencode(str
                return 0;
        }
 
-       erq->length = 0;
+       memcpy(key, sdata->keys[idx]->key,
+              min((int)erq->length, sdata->keys[idx]->keylen));
+       erq->length = sdata->keys[idx]->keylen;
        erq->flags |= IW_ENCODE_ENABLED;
 
        return 0;
@@ -3054,9 +3063,10 @@ static int ieee80211_ioctl_siwencodeext(
                if (!sdata->default_key)
                        idx = 0;
                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
-                       if (sdata->default_key == sdata->keys[i])
+                       if (sdata->default_key == sdata->keys[i]) {
                                idx = i;
-                       break;
+                               break;
+                       }
                }
                if (idx < 0)
                        return -EINVAL;
-- 
1.3.0

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html