Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[~andy/linux] / net / mac80211 / key.c

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 7ae678ba5d679dbd40fc7c199c499ed82228757f..d27e61aaa71bd7200c527606820f5d5d82c39ff0 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -402,7 +402,7 @@ static void __ieee80211_key_destroy(struct ieee80211_key *key)
         * Synchronize so the TX path can no longer be using
         * this key before we free/remove it.
         */
-       synchronize_rcu();
+       synchronize_net();
 
        if (key->local)
                ieee80211_key_disable_hw_accel(key);