summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-10-11 11:47:57 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-10-12 15:55:52 -0400
commit51f98f1313d2fc4b1d3a3e1f4db7cf4925b29df6 (patch)
treed39f829ab22aff38791a0c13e05eab985598ef6e /net/mac80211/ibss.c
parent5e4708bcb5d5360730e31b14e5e36429fc7d48b2 (diff)
downloadop-kernel-dev-51f98f1313d2fc4b1d3a3e1f4db7cf4925b29df6.zip
op-kernel-dev-51f98f1313d2fc4b1d3a3e1f4db7cf4925b29df6.tar.gz
mac80211: fix ibss race
When a scan completes, we call ieee80211_sta_find_ibss(), which is also called from other places. When the scan was done in software, there's no problem as both run from the single-threaded mac80211 workqueue and are thus serialised against each other, but with hardware scan the completion can be in a different context and race against callers of this function from the workqueue (e.g. due to beacon RX). So instead of calling ieee80211_sta_find_ibss() directly, just arm the timer and have it fire, scheduling the work, which will invoke ieee80211_sta_find_ibss() (if that is appropriate in the current state). Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r--net/mac80211/ibss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 812cbab..6eaf698 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -829,7 +829,7 @@ void ieee80211_ibss_notify_scan_completed(struct ieee80211_local *local)
if (!sdata->u.ibss.ssid_len)
continue;
sdata->u.ibss.last_scan_completed = jiffies;
- ieee80211_sta_find_ibss(sdata);
+ mod_timer(&sdata->u.ibss.timer, 0);
}
mutex_unlock(&local->iflist_mtx);
}
OpenPOWER on IntegriCloud