rt2x00: Add WCID to crypto struct

When a WCID was already assigned to a STA the key configuration
functions need to use the same WCID for configuring the keys. Hence, add
the WCID to the crypo configuration structure.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 3b71d792bbf5..cbf8eb334e96 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -478,6 +478,8 @@ struct rt2x00lib_crypto {
         u8 key[16];
         u8 tx_mic[8];
         u8 rx_mic[8];
+
+        int wcid;
 };
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 6a03f93e92ac..cef1c878c37e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -494,6 +494,7 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         struct rt2x00lib_crypto crypto;
         static const u8 bcast_addr[ETH_ALEN] =
                 { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, };
+        struct rt2x00_sta *sta_priv = NULL;
 
         if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
                 return 0;
@@ -511,9 +512,11 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         crypto.cmd = cmd;
 
-        if (sta)
+        if (sta) {
                 crypto.address = sta->addr;
-        else
+                sta_priv = sta_to_rt2x00_sta(sta);
+                crypto.wcid = sta_priv->wcid;
+        } else
                 crypto.address = bcast_addr;
 
         if (crypto.cipher == CIPHER_TKIP)