aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_sta.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-03-31 13:23:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-04-01 17:14:10 -0400
commitdc6676b7f2c2072ec05254aaca32e99f87a8a417 (patch)
tree6caf7e007063f9ae6a16fdcb1912bf72d31237c2 /net/mac80211/ieee80211_sta.c
parent4f6fab472c4c7c21d577f85fabec7628d4a05637 (diff)
mac80211: sta_info_flush() fixes
When the IBSS code tries to flush the STA list, it does so in an atomic context. Flushing isn't safe there, however, and requires the RTNL, so we need to defer it to a workqueue. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index c5a47f8d873a..75b96a754333 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -2254,7 +2254,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
2254 sdata = IEEE80211_DEV_TO_SUB_IF(dev); 2254 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
2255 2255
2256 /* Remove possible STA entries from other IBSS networks. */ 2256 /* Remove possible STA entries from other IBSS networks. */
2257 sta_info_flush(local, sdata); 2257 sta_info_flush_delayed(sdata);
2258 2258
2259 if (local->ops->reset_tsf) { 2259 if (local->ops->reset_tsf) {
2260 /* Reset own TSF to allow time synchronization work. */ 2260 /* Reset own TSF to allow time synchronization work. */