diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-03-31 19:23:02 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-01 17:14:10 -0400 |
commit | 4f6fab472c4c7c21d577f85fabec7628d4a05637 (patch) | |
tree | 0949dffadb0b715053e4d7148ebcabe930b39361 /net/mac80211/ieee80211_sta.c | |
parent | 93e5deb1ae39b56f4743955e76c72251256f23c1 (diff) |
mac80211: clean up sta_info_destroy() users wrt. RCU/locking
Calling sta_info_destroy() doesn't require RCU-synchronisation
before-hand because it does that internally. However, it does
require rtnl-locking so insert that where necessary.
Also clean up the code doing it internally to be a bit clearer and
not synchronize twice if keys are configured.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index 00fde111c268..c5a47f8d873a 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c @@ -939,7 +939,6 @@ static void ieee80211_associated(struct net_device *dev, rcu_read_unlock(); if (disassoc && sta) { - synchronize_rcu(); rtnl_lock(); sta_info_destroy(sta); rtnl_unlock(); |