mac80211: support separate default keys
[linux-2.6.git] / net / mac80211 / key.c
index 999f7aa..84cf919 100644 (file)
 #include <linux/list.h>
 #include <linux/rcupdate.h>
 #include <linux/rtnetlink.h>
+#include <linux/slab.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
+#include "driver-ops.h"
 #include "debugfs_key.h"
 #include "aes_ccm.h"
+#include "aes_cmac.h"
 
 
 /**
  * There is currently no way of knowing this except by looking into
  * debugfs.
  *
- * All key operations are protected internally so you can call them at
- * any time.
+ * All key operations are protected internally.
  *
  * Within mac80211, key references are, just as STA structure references,
  * protected by RCU. Note, however, that some things are unprotected,
  * namely the key->sta dereferences within the hardware acceleration
- * functions. This means that sta_info_destroy() must flush the key todo
- * list.
- *
- * All the direct key list manipulation functions must not sleep because
- * they can operate on STA info structs that are protected by RCU.
+ * functions. This means that sta_info_destroy() must remove the key
+ * which waits for an RCU grace period.
  */
 
 static const u8 bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-static const u8 zero_addr[ETH_ALEN];
-
-/* key mutex: used to synchronise todo runners */
-static DEFINE_MUTEX(key_mutex);
-static DEFINE_SPINLOCK(todo_lock);
-static LIST_HEAD(todo_list);
-
-static void key_todo(struct work_struct *work)
-{
-       ieee80211_key_todo();
-}
-
-static DECLARE_WORK(todo_work, key_todo);
-
-/**
- * add_todo - add todo item for a key
- *
- * @key: key to add to do item for
- * @flag: todo flag(s)
- */
-static void add_todo(struct ieee80211_key *key, u32 flag)
-{
-       if (!key)
-               return;
-
-       spin_lock(&todo_lock);
-       key->flags |= flag;
-       /*
-        * Remove again if already on the list so that we move it to the end.
-        */
-       if (!list_empty(&key->todo))
-               list_del(&key->todo);
-       list_add_tail(&key->todo, &todo_list);
-       schedule_work(&todo_work);
-       spin_unlock(&todo_lock);
-}
-
-/**
- * ieee80211_key_lock - lock the mac80211 key operation lock
- *
- * This locks the (global) mac80211 key operation lock, all
- * key operations must be done under this lock.
- */
-static void ieee80211_key_lock(void)
-{
-       mutex_lock(&key_mutex);
-}
-
-/**
- * ieee80211_key_unlock - unlock the mac80211 key operation lock
- */
-static void ieee80211_key_unlock(void)
-{
-       mutex_unlock(&key_mutex);
-}
 
-static void assert_key_lock(void)
+static void assert_key_lock(struct ieee80211_local *local)
 {
-       WARN_ON(!mutex_is_locked(&key_mutex));
+       lockdep_assert_held(&local->key_mtx);
 }
 
-static const u8 *get_mac_for_key(struct ieee80211_key *key)
+static struct ieee80211_sta *get_sta_for_key(struct ieee80211_key *key)
 {
-       const u8 *addr = bcast_addr;
-
-       /*
-        * If we're an AP we won't ever receive frames with a non-WEP
-        * group key so we tell the driver that by using the zero MAC
-        * address to indicate a transmit-only key.
-        */
-       if (key->conf.alg != ALG_WEP &&
-           (key->sdata->vif.type == NL80211_IFTYPE_AP ||
-            key->sdata->vif.type == NL80211_IFTYPE_AP_VLAN))
-               addr = zero_addr;
-
        if (key->sta)
-               addr = key->sta->sta.addr;
+               return &key->sta->sta;
 
-       return addr;
+       return NULL;
 }
 
-static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
+static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
 {
-       const u8 *addr;
+       struct ieee80211_sub_if_data *sdata;
+       struct ieee80211_sta *sta;
        int ret;
 
-       assert_key_lock();
        might_sleep();
 
        if (!key->local->ops->set_key)
-               return;
+               goto out_unsupported;
+
+       assert_key_lock(key->local);
+
+       sta = get_sta_for_key(key);
 
-       addr = get_mac_for_key(key);
+       /*
+        * If this is a per-STA GTK, check if it
+        * is supported; if not, return.
+        */
+       if (sta && !(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE) &&
+           !(key->local->hw.flags & IEEE80211_HW_SUPPORTS_PER_STA_GTK))
+               goto out_unsupported;
 
-       ret = key->local->ops->set_key(local_to_hw(key->local), SET_KEY,
-                                      key->sdata->dev->dev_addr, addr,
-                                      &key->conf);
+       sdata = key->sdata;
+       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+               /*
+                * The driver doesn't know anything about VLAN interfaces.
+                * Hence, don't send GTKs for VLAN interfaces to the driver.
+                */
+               if (!(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE))
+                       goto out_unsupported;
+               sdata = container_of(sdata->bss,
+                                    struct ieee80211_sub_if_data,
+                                    u.ap);
+       }
+
+       ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);
 
        if (!ret) {
-               spin_lock(&todo_lock);
                key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;
-               spin_unlock(&todo_lock);
+               return 0;
        }
 
-       if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP)
-               printk(KERN_ERR "mac80211-%s: failed to set key "
-                      "(%d, %pM) to hardware (%d)\n",
-                      wiphy_name(key->local->hw.wiphy),
-                      key->conf.keyidx, addr, ret);
+       if (ret != -ENOSPC && ret != -EOPNOTSUPP)
+               wiphy_err(key->local->hw.wiphy,
+                         "failed to set key (%d, %pM) to hardware (%d)\n",
+                         key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
+
+ out_unsupported:
+       switch (key->conf.cipher) {
+       case WLAN_CIPHER_SUITE_WEP40:
+       case WLAN_CIPHER_SUITE_WEP104:
+       case WLAN_CIPHER_SUITE_TKIP:
+       case WLAN_CIPHER_SUITE_CCMP:
+       case WLAN_CIPHER_SUITE_AES_CMAC:
+               /* all of these we can do in software */
+               return 0;
+       default:
+               return -EINVAL;
+       }
 }
 
 static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
 {
-       const u8 *addr;
+       struct ieee80211_sub_if_data *sdata;
+       struct ieee80211_sta *sta;
        int ret;
 
-       assert_key_lock();
        might_sleep();
 
        if (!key || !key->local->ops->set_key)
                return;
 
-       spin_lock(&todo_lock);
-       if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) {
-               spin_unlock(&todo_lock);
+       assert_key_lock(key->local);
+
+       if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))
                return;
-       }
-       spin_unlock(&todo_lock);
 
-       addr = get_mac_for_key(key);
+       sta = get_sta_for_key(key);
+       sdata = key->sdata;
+
+       if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+               sdata = container_of(sdata->bss,
+                                    struct ieee80211_sub_if_data,
+                                    u.ap);
 
-       ret = key->local->ops->set_key(local_to_hw(key->local), DISABLE_KEY,
-                                      key->sdata->dev->dev_addr, addr,
-                                      &key->conf);
+       ret = drv_set_key(key->local, DISABLE_KEY, sdata,
+                         sta, &key->conf);
 
        if (ret)
-               printk(KERN_ERR "mac80211-%s: failed to remove key "
-                      "(%d, %pM) from hardware (%d)\n",
-                      wiphy_name(key->local->hw.wiphy),
-                      key->conf.keyidx, addr, ret);
+               wiphy_err(key->local->hw.wiphy,
+                         "failed to remove key (%d, %pM) from hardware (%d)\n",
+                         key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
+
+       key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
+}
+
+void ieee80211_key_removed(struct ieee80211_key_conf *key_conf)
+{
+       struct ieee80211_key *key;
+
+       key = container_of(key_conf, struct ieee80211_key, conf);
+
+       might_sleep();
+       assert_key_lock(key->local);
 
-       spin_lock(&todo_lock);
        key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
-       spin_unlock(&todo_lock);
+
+       /*
+        * Flush TX path to avoid attempts to use this key
+        * after this function returns. Until then, drivers
+        * must be prepared to handle the key.
+        */
+       synchronize_rcu();
 }
+EXPORT_SYMBOL_GPL(ieee80211_key_removed);
 
 static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata,
-                                       int idx)
+                                       int idx, bool uni, bool multi)
 {
        struct ieee80211_key *key = NULL;
 
+       assert_key_lock(sdata->local);
+
        if (idx >= 0 && idx < NUM_DEFAULT_KEYS)
                key = sdata->keys[idx];
 
-       rcu_assign_pointer(sdata->default_key, key);
+       if (uni)
+               rcu_assign_pointer(sdata->default_unicast_key, key);
+       if (multi)
+               rcu_assign_pointer(sdata->default_multicast_key, key);
 
-       if (key)
-               add_todo(key, KEY_FLAG_TODO_DEFKEY);
+       ieee80211_debugfs_key_update_default(sdata);
 }
 
-void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx)
+void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx,
+                              bool uni, bool multi)
 {
-       unsigned long flags;
+       mutex_lock(&sdata->local->key_mtx);
+       __ieee80211_set_default_key(sdata, idx, uni, multi);
+       mutex_unlock(&sdata->local->key_mtx);
+}
 
-       spin_lock_irqsave(&sdata->local->key_lock, flags);
-       __ieee80211_set_default_key(sdata, idx);
-       spin_unlock_irqrestore(&sdata->local->key_lock, flags);
+static void
+__ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata, int idx)
+{
+       struct ieee80211_key *key = NULL;
+
+       assert_key_lock(sdata->local);
+
+       if (idx >= NUM_DEFAULT_KEYS &&
+           idx < NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS)
+               key = sdata->keys[idx];
+
+       rcu_assign_pointer(sdata->default_mgmt_key, key);
+
+       ieee80211_debugfs_key_update_default(sdata);
+}
+
+void ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata,
+                                   int idx)
+{
+       mutex_lock(&sdata->local->key_mtx);
+       __ieee80211_set_default_mgmt_key(sdata, idx);
+       mutex_unlock(&sdata->local->key_mtx);
 }
 
 
 static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
                                    struct sta_info *sta,
+                                   bool pairwise,
                                    struct ieee80211_key *old,
                                    struct ieee80211_key *new)
 {
-       int idx, defkey;
+       int idx;
+       bool defunikey, defmultikey, defmgmtkey;
 
        if (new)
                list_add(&new->list, &sdata->key_list);
 
-       if (sta) {
-               rcu_assign_pointer(sta->key, new);
+       if (sta && pairwise) {
+               rcu_assign_pointer(sta->ptk, new);
+       } else if (sta) {
+               if (old)
+                       idx = old->conf.keyidx;
+               else
+                       idx = new->conf.keyidx;
+               rcu_assign_pointer(sta->gtk[idx], new);
        } else {
                WARN_ON(new && old && new->conf.keyidx != old->conf.keyidx);
 
@@ -237,14 +256,27 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
                else
                        idx = new->conf.keyidx;
 
-               defkey = old && sdata->default_key == old;
+               defunikey = old && sdata->default_unicast_key == old;
+               defmultikey = old && sdata->default_multicast_key == old;
+               defmgmtkey = old && sdata->default_mgmt_key == old;
 
-               if (defkey && !new)
-                       __ieee80211_set_default_key(sdata, -1);
+               if (defunikey && !new)
+                       __ieee80211_set_default_key(sdata, -1, true, false);
+               if (defmultikey && !new)
+                       __ieee80211_set_default_key(sdata, -1, false, true);
+               if (defmgmtkey && !new)
+                       __ieee80211_set_default_mgmt_key(sdata, -1);
 
                rcu_assign_pointer(sdata->keys[idx], new);
-               if (defkey && new)
-                       __ieee80211_set_default_key(sdata, new->conf.keyidx);
+               if (defunikey && new)
+                       __ieee80211_set_default_key(sdata, new->conf.keyidx,
+                                                   true, false);
+               if (defmultikey && new)
+                       __ieee80211_set_default_key(sdata, new->conf.keyidx,
+                                                   false, true);
+               if (defmgmtkey && new)
+                       __ieee80211_set_default_mgmt_key(sdata,
+                                                        new->conf.keyidx);
        }
 
        if (old) {
@@ -256,18 +288,18 @@ static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
        }
 }
 
-struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
-                                         int idx,
-                                         size_t key_len,
-                                         const u8 *key_data)
+struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len,
+                                         const u8 *key_data,
+                                         size_t seq_len, const u8 *seq)
 {
        struct ieee80211_key *key;
+       int i, j, err;
 
-       BUG_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS);
+       BUG_ON(idx < 0 || idx >= NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS);
 
        key = kzalloc(sizeof(struct ieee80211_key) + key_len, GFP_KERNEL);
        if (!key)
-               return NULL;
+               return ERR_PTR(-ENOMEM);
 
        /*
         * Default to software encryption; we'll later upload the
@@ -276,49 +308,97 @@ struct ieee80211_key *ieee80211_key_alloc(enum ieee80211_key_alg alg,
        key->conf.flags = 0;
        key->flags = 0;
 
-       key->conf.alg = alg;
+       key->conf.cipher = cipher;
        key->conf.keyidx = idx;
        key->conf.keylen = key_len;
-       switch (alg) {
-       case ALG_WEP:
+       switch (cipher) {
+       case WLAN_CIPHER_SUITE_WEP40:
+       case WLAN_CIPHER_SUITE_WEP104:
                key->conf.iv_len = WEP_IV_LEN;
                key->conf.icv_len = WEP_ICV_LEN;
                break;
-       case ALG_TKIP:
+       case WLAN_CIPHER_SUITE_TKIP:
                key->conf.iv_len = TKIP_IV_LEN;
                key->conf.icv_len = TKIP_ICV_LEN;
+               if (seq) {
+                       for (i = 0; i < NUM_RX_DATA_QUEUES; i++) {
+                               key->u.tkip.rx[i].iv32 =
+                                       get_unaligned_le32(&seq[2]);
+                               key->u.tkip.rx[i].iv16 =
+                                       get_unaligned_le16(seq);
+                       }
+               }
                break;
-       case ALG_CCMP:
+       case WLAN_CIPHER_SUITE_CCMP:
                key->conf.iv_len = CCMP_HDR_LEN;
                key->conf.icv_len = CCMP_MIC_LEN;
-               break;
-       }
-       memcpy(key->conf.key, key_data, key_len);
-       INIT_LIST_HEAD(&key->list);
-       INIT_LIST_HEAD(&key->todo);
-
-       if (alg == ALG_CCMP) {
+               if (seq) {
+                       for (i = 0; i < NUM_RX_DATA_QUEUES + 1; i++)
+                               for (j = 0; j < CCMP_PN_LEN; j++)
+                                       key->u.ccmp.rx_pn[i][j] =
+                                               seq[CCMP_PN_LEN - j - 1];
+               }
                /*
                 * Initialize AES key state here as an optimization so that
                 * it does not need to be initialized for every packet.
                 */
                key->u.ccmp.tfm = ieee80211_aes_key_setup_encrypt(key_data);
-               if (!key->u.ccmp.tfm) {
+               if (IS_ERR(key->u.ccmp.tfm)) {
+                       err = PTR_ERR(key->u.ccmp.tfm);
+                       kfree(key);
+                       key = ERR_PTR(err);
+               }
+               break;
+       case WLAN_CIPHER_SUITE_AES_CMAC:
+               key->conf.iv_len = 0;
+               key->conf.icv_len = sizeof(struct ieee80211_mmie);
+               if (seq)
+                       for (j = 0; j < 6; j++)
+                               key->u.aes_cmac.rx_pn[j] = seq[6 - j - 1];
+               /*
+                * Initialize AES key state here as an optimization so that
+                * it does not need to be initialized for every packet.
+                */
+               key->u.aes_cmac.tfm =
+                       ieee80211_aes_cmac_key_setup(key_data);
+               if (IS_ERR(key->u.aes_cmac.tfm)) {
+                       err = PTR_ERR(key->u.aes_cmac.tfm);
                        kfree(key);
-                       return NULL;
+                       key = ERR_PTR(err);
                }
+               break;
        }
+       memcpy(key->conf.key, key_data, key_len);
+       INIT_LIST_HEAD(&key->list);
 
        return key;
 }
 
-void ieee80211_key_link(struct ieee80211_key *key,
-                       struct ieee80211_sub_if_data *sdata,
-                       struct sta_info *sta)
+static void __ieee80211_key_destroy(struct ieee80211_key *key)
+{
+       if (!key)
+               return;
+
+       if (key->local)
+               ieee80211_key_disable_hw_accel(key);
+
+       if (key->conf.cipher == WLAN_CIPHER_SUITE_CCMP)
+               ieee80211_aes_key_free(key->u.ccmp.tfm);
+       if (key->conf.cipher == WLAN_CIPHER_SUITE_AES_CMAC)
+               ieee80211_aes_cmac_key_free(key->u.aes_cmac.tfm);
+       if (key->local)
+               ieee80211_debugfs_key_remove(key);
+
+       kfree(key);
+}
+
+int ieee80211_key_link(struct ieee80211_key *key,
+                      struct ieee80211_sub_if_data *sdata,
+                      struct sta_info *sta)
 {
        struct ieee80211_key *old_key;
-       unsigned long flags;
-       int idx;
+       int idx, ret;
+       bool pairwise = key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE;
 
        BUG_ON(!sdata);
        BUG_ON(!key);
@@ -335,13 +415,6 @@ void ieee80211_key_link(struct ieee80211_key *key,
                 */
                if (test_sta_flags(sta, WLAN_STA_WME))
                        key->conf.flags |= IEEE80211_KEY_FLAG_WMM_STA;
-
-               /*
-                * This key is for a specific sta interface,
-                * inform the driver that it should try to store
-                * this key as pairwise key.
-                */
-               key->conf.flags |= IEEE80211_KEY_FLAG_PAIRWISE;
        } else {
                if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                        struct sta_info *ap;
@@ -352,7 +425,7 @@ void ieee80211_key_link(struct ieee80211_key *key,
                         */
 
                        /* same here, the AP could be using QoS */
-                       ap = sta_info_get(key->local, key->sdata->u.sta.bssid);
+                       ap = sta_info_get(key->sdata, key->sdata->u.mgd.bssid);
                        if (ap) {
                                if (test_sta_flags(ap, WLAN_STA_WME))
                                        key->conf.flags |=
@@ -361,23 +434,25 @@ void ieee80211_key_link(struct ieee80211_key *key,
                }
        }
 
-       spin_lock_irqsave(&sdata->local->key_lock, flags);
+       mutex_lock(&sdata->local->key_mtx);
 
-       if (sta)
-               old_key = sta->key;
+       if (sta && pairwise)
+               old_key = sta->ptk;
+       else if (sta)
+               old_key = sta->gtk[idx];
        else
                old_key = sdata->keys[idx];
 
-       __ieee80211_key_replace(sdata, sta, old_key, key);
+       __ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
+       __ieee80211_key_destroy(old_key);
 
-       spin_unlock_irqrestore(&sdata->local->key_lock, flags);
+       ieee80211_debugfs_key_add(key);
 
-       /* free old key later */
-       add_todo(old_key, KEY_FLAG_TODO_DELETE);
+       ret = ieee80211_key_enable_hw_accel(key);
 
-       add_todo(key, KEY_FLAG_TODO_ADD_DEBUGFS);
-       if (netif_running(sdata->dev))
-               add_todo(key, KEY_FLAG_TODO_HWACCEL_ADD);
+       mutex_unlock(&sdata->local->key_mtx);
+
+       return ret;
 }
 
 static void __ieee80211_key_free(struct ieee80211_key *key)
@@ -387,162 +462,65 @@ static void __ieee80211_key_free(struct ieee80211_key *key)
         */
        if (key->sdata)
                __ieee80211_key_replace(key->sdata, key->sta,
-                                       key, NULL);
-
-       add_todo(key, KEY_FLAG_TODO_DELETE);
+                               key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
+                               key, NULL);
+       __ieee80211_key_destroy(key);
 }
 
-void ieee80211_key_free(struct ieee80211_key *key)
+void ieee80211_key_free(struct ieee80211_local *local,
+                       struct ieee80211_key *key)
 {
-       unsigned long flags;
-
        if (!key)
                return;
 
-       if (!key->sdata) {
-               /* The key has not been linked yet, simply free it
-                * and don't Oops */
-               if (key->conf.alg == ALG_CCMP)
-                       ieee80211_aes_key_free(key->u.ccmp.tfm);
-               kfree(key);
-               return;
-       }
-
-       spin_lock_irqsave(&key->sdata->local->key_lock, flags);
+       mutex_lock(&local->key_mtx);
        __ieee80211_key_free(key);
-       spin_unlock_irqrestore(&key->sdata->local->key_lock, flags);
-}
-
-/*
- * To be safe against concurrent manipulations of the list (which shouldn't
- * actually happen) we need to hold the spinlock. But under the spinlock we
- * can't actually do much, so we defer processing to the todo list. Then run
- * the todo list to be sure the operation and possibly previously pending
- * operations are completed.
- */
-static void ieee80211_todo_for_each_key(struct ieee80211_sub_if_data *sdata,
-                                       u32 todo_flags)
-{
-       struct ieee80211_key *key;
-       unsigned long flags;
-
-       might_sleep();
-
-       spin_lock_irqsave(&sdata->local->key_lock, flags);
-       list_for_each_entry(key, &sdata->key_list, list)
-               add_todo(key, todo_flags);
-       spin_unlock_irqrestore(&sdata->local->key_lock, flags);
-
-       ieee80211_key_todo();
+       mutex_unlock(&local->key_mtx);
 }
 
 void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata)
 {
-       ASSERT_RTNL();
-
-       if (WARN_ON(!netif_running(sdata->dev)))
-               return;
-
-       ieee80211_todo_for_each_key(sdata, KEY_FLAG_TODO_HWACCEL_ADD);
-}
+       struct ieee80211_key *key;
 
-void ieee80211_disable_keys(struct ieee80211_sub_if_data *sdata)
-{
        ASSERT_RTNL();
 
-       ieee80211_todo_for_each_key(sdata, KEY_FLAG_TODO_HWACCEL_REMOVE);
-}
-
-static void __ieee80211_key_destroy(struct ieee80211_key *key)
-{
-       if (!key)
+       if (WARN_ON(!ieee80211_sdata_running(sdata)))
                return;
 
-       ieee80211_key_disable_hw_accel(key);
+       mutex_lock(&sdata->local->key_mtx);
 
-       if (key->conf.alg == ALG_CCMP)
-               ieee80211_aes_key_free(key->u.ccmp.tfm);
-       ieee80211_debugfs_key_remove(key);
+       list_for_each_entry(key, &sdata->key_list, list)
+               ieee80211_key_enable_hw_accel(key);
 
-       kfree(key);
+       mutex_unlock(&sdata->local->key_mtx);
 }
 
-static void __ieee80211_key_todo(void)
+void ieee80211_disable_keys(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_key *key;
-       bool work_done;
-       u32 todoflags;
 
-       /*
-        * NB: sta_info_destroy relies on this!
-        */
-       synchronize_rcu();
-
-       spin_lock(&todo_lock);
-       while (!list_empty(&todo_list)) {
-               key = list_first_entry(&todo_list, struct ieee80211_key, todo);
-               list_del_init(&key->todo);
-               todoflags = key->flags & (KEY_FLAG_TODO_ADD_DEBUGFS |
-                                         KEY_FLAG_TODO_DEFKEY |
-                                         KEY_FLAG_TODO_HWACCEL_ADD |
-                                         KEY_FLAG_TODO_HWACCEL_REMOVE |
-                                         KEY_FLAG_TODO_DELETE);
-               key->flags &= ~todoflags;
-               spin_unlock(&todo_lock);
-
-               work_done = false;
-
-               if (todoflags & KEY_FLAG_TODO_ADD_DEBUGFS) {
-                       ieee80211_debugfs_key_add(key);
-                       work_done = true;
-               }
-               if (todoflags & KEY_FLAG_TODO_DEFKEY) {
-                       ieee80211_debugfs_key_remove_default(key->sdata);
-                       ieee80211_debugfs_key_add_default(key->sdata);
-                       work_done = true;
-               }
-               if (todoflags & KEY_FLAG_TODO_HWACCEL_ADD) {
-                       ieee80211_key_enable_hw_accel(key);
-                       work_done = true;
-               }
-               if (todoflags & KEY_FLAG_TODO_HWACCEL_REMOVE) {
-                       ieee80211_key_disable_hw_accel(key);
-                       work_done = true;
-               }
-               if (todoflags & KEY_FLAG_TODO_DELETE) {
-                       __ieee80211_key_destroy(key);
-                       work_done = true;
-               }
+       ASSERT_RTNL();
 
-               WARN_ON(!work_done);
+       mutex_lock(&sdata->local->key_mtx);
 
-               spin_lock(&todo_lock);
-       }
-       spin_unlock(&todo_lock);
-}
+       list_for_each_entry(key, &sdata->key_list, list)
+               ieee80211_key_disable_hw_accel(key);
 
-void ieee80211_key_todo(void)
-{
-       ieee80211_key_lock();
-       __ieee80211_key_todo();
-       ieee80211_key_unlock();
+       mutex_unlock(&sdata->local->key_mtx);
 }
 
 void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata)
 {
        struct ieee80211_key *key, *tmp;
-       unsigned long flags;
 
-       ieee80211_key_lock();
+       mutex_lock(&sdata->local->key_mtx);
 
-       ieee80211_debugfs_key_remove_default(sdata);
+       ieee80211_debugfs_key_remove_mgmt_default(sdata);
 
-       spin_lock_irqsave(&sdata->local->key_lock, flags);
        list_for_each_entry_safe(key, tmp, &sdata->key_list, list)
                __ieee80211_key_free(key);
-       spin_unlock_irqrestore(&sdata->local->key_lock, flags);
 
-       __ieee80211_key_todo();
+       ieee80211_debugfs_key_update_default(sdata);
 
-       ieee80211_key_unlock();
+       mutex_unlock(&sdata->local->key_mtx);
 }