From 118e56e00e4636a6854fc602742e4a6d8557fa3c Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Wed, 5 Sep 2012 20:23:56 +0300 Subject: [PATCH] --- yaml --- r: 328155 b: refs/heads/master c: 964b19f9770cd8d299fa99c84b0ff2e90df9c523 h: refs/heads/master i: 328153: 166a4db80a1670bf22e326f1bb28ded286aa563f 328151: 39649c50b924d982f61d6bf3d6f233353e54c99a v: v3 --- [refs] | 2 +- trunk/net/mac80211/key.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c09e07cde3db..e3bc4f5a8b92 100644 --- 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 index 7ae678ba5d67..d27e61aaa71b 100644 --- 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);