---

yaml --- r: 328155 b: refs/heads/master c: 964b19f h: refs/heads/master i: 328153: 166a4db 328151: 39649c5 v: v3
git-mirror · Sep 6, 2012 · 118e56e · 118e56e
1 parent 6b9ed05
commit 118e56e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 761a48d2603c0ff48024bc70c129b00ec37639ed
+refs/heads/master: 964b19f9770cd8d299fa99c84b0ff2e90df9c523
diff --git a/trunk/net/mac80211/key.c b/trunk/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);