Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[~shefty/rdma-dev.git] / net / mac80211 / key.c
index 315ee301b75ee3ddc5aead3f581bf8686342412b..8c02469b7176526994fc1bb749eee30e943ef5ca 100644 (file)
@@ -375,6 +375,12 @@ static void __ieee80211_key_destroy(struct ieee80211_key *key)
        if (!key)
                return;
 
+       /*
+        * Synchronize so the TX path can no longer be using
+        * this key before we free/remove it.
+        */
+       synchronize_rcu();
+
        if (key->local)
                ieee80211_key_disable_hw_accel(key);