[PATCH] wireless/atmel: fix setting TX key only in ENCODEEXT

The previous patch that added ENCODEEXT and AUTH support to the atmel
driver contained a slight error which would cause just setting the TX
key index to also set the encryption key again.  This patch allows any
combination of setting the TX key index and setting an encryption key.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 98a76f10a0f71f29f09ef031b000659dbbccb09c..c1c27e10b8df870c9c9b05b208b5e8613c27361e 100644 (file)
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1872,7 +1872,7 @@ static int atmel_set_encodeext(struct net_device *dev,
        struct atmel_private *priv = netdev_priv(dev);
        struct iw_point *encoding = &wrqu->encoding;
        struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-       int idx, key_len;
+       int idx, key_len, alg = ext->alg, set_key = 1;
 
        /* Determine and validate the key index */
        idx = encoding->flags & IW_ENCODE_INDEX;
@@ -1883,39 +1883,42 @@ static int atmel_set_encodeext(struct net_device *dev,
        } else
                idx = priv->default_key;
 
-       if ((encoding->flags & IW_ENCODE_DISABLED) ||
-           ext->alg == IW_ENCODE_ALG_NONE) {
-               priv->wep_is_on = 0;
-               priv->encryption_level = 0;
-               priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;
-       }
+       if (encoding->flags & IW_ENCODE_DISABLED)
+           alg = IW_ENCODE_ALG_NONE;
 
-       if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
+       if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
                priv->default_key = idx;
+               set_key = ext->key_len > 0 ? 1 : 0;
+       }
 
-       /* Set the requested key */
-       switch (ext->alg) {
-       case IW_ENCODE_ALG_NONE:
-               break;
-       case IW_ENCODE_ALG_WEP:
-               if (ext->key_len > 5) {
-                       priv->wep_key_len[idx] = 13;
-                       priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128;
-                       priv->encryption_level = 2;
-               } else if (ext->key_len > 0) {
-                       priv->wep_key_len[idx] = 5;
-                       priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64;
-                       priv->encryption_level = 1;
-               } else {
+       if (set_key) {
+               /* Set the requested key first */
+               switch (alg) {
+               case IW_ENCODE_ALG_NONE:
+                       priv->wep_is_on = 0;
+                       priv->encryption_level = 0;
+                       priv->pairwise_cipher_suite = CIPHER_SUITE_NONE;
+                       break;
+               case IW_ENCODE_ALG_WEP:
+                       if (ext->key_len > 5) {
+                               priv->wep_key_len[idx] = 13;
+                               priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_128;
+                               priv->encryption_level = 2;
+                       } else if (ext->key_len > 0) {
+                               priv->wep_key_len[idx] = 5;
+                               priv->pairwise_cipher_suite = CIPHER_SUITE_WEP_64;
+                               priv->encryption_level = 1;
+                       } else {
+                               return -EINVAL;
+                       }
+                       priv->wep_is_on = 1;
+                       memset(priv->wep_keys[idx], 0, 13);
+                       key_len = min ((int)ext->key_len, priv->wep_key_len[idx]);
+                       memcpy(priv->wep_keys[idx], ext->key, key_len);
+                       break;
+               default:
                        return -EINVAL;
                }
-               priv->wep_is_on = 1;
-               memset(priv->wep_keys[idx], 0, 13);
-               key_len = min ((int)ext->key_len, priv->wep_key_len[idx]);
-               memcpy(priv->wep_keys[idx], ext->key, key_len);
-               break;
-       default:
-               return -EINVAL;
        }
 
        return -EINPROGRESS;