1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 242d59558b79..cdaf93f48263 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -351,6 +351,14 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev,
 
         if (crypto->cmd == SET_KEY) {
                 /*
+                 * Disallow to set WEP key other than with index 0,
+                 * it is known that not work at least on some hardware.
+                 * SW crypto will be used in that case.
+                 */
+                if (key->alg == ALG_WEP && key->keyidx != 0)
+                        return -EOPNOTSUPP;
+
+                /*
                  * Pairwise key will always be entry 0, but this
                  * could collide with a shared key on the same
                  * position...
@@ -376,7 +384,7 @@ static int rt2500usb_config_key(struct rt2x00_dev *rt2x00dev,
                 if (key->hw_key_idx > 0 && crypto->cipher != curr_cipher)
                         return -EOPNOTSUPP;
 
-                rt2500usb_register_multiwrite(rt2x00dev, reg,
+                rt2500usb_register_multiwrite(rt2x00dev, KEY_ENTRY(key->hw_key_idx),
                                               crypto->key, sizeof(crypto->key));
 
                 /*
@@ -817,6 +825,7 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2500usb_register_write(rt2x00dev, MAC_CSR8, reg);
 
         rt2500usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
+        rt2x00_set_field16(&reg, TXRX_CSR0_ALGORITHM, CIPHER_NONE);
         rt2x00_set_field16(&reg, TXRX_CSR0_IV_OFFSET, IEEE80211_HEADER);
         rt2x00_set_field16(&reg, TXRX_CSR0_KEY_ID, 0);
         rt2500usb_register_write(rt2x00dev, TXRX_CSR0, reg);