1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index dded6807100..38edee5fe16 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -487,6 +487,7 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                       struct ieee80211_key_conf *key)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
+        struct ieee80211_sta *sta;
         int (*set_key) (struct rt2x00_dev *rt2x00dev,
                         struct rt2x00lib_crypto *crypto,
                         struct ieee80211_key_conf *key);
@@ -537,6 +538,17 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 memcpy(&crypto.key, &key->key[0], key->keylen);
 
         /*
+         * Discover the Association ID from mac80211.
+         * Some drivers need this information when updating the
+         * hardware key (either adding or removing).
+         */
+        rcu_read_lock();
+        sta = ieee80211_find_sta(hw, address);
+        if (sta)
+                crypto.aid = sta->aid;
+        rcu_read_unlock();
+
+        /*
          * Each BSS has a maximum of 4 shared keys.
          * Shared key index values:
          *      0) BSS0 key0