summaryrefslogtreecommitdiff
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2009-03-09 15:47:08 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-03-16 18:09:38 -0400
commitaf88b9078d4aa31d667d2d82601ede9cae3bac37 (patch)
treeafd9528736ecaf17eb1628be08abead2fee699f7 /net/mac80211/scan.c
parent8830cb678b13004ab54f606345769f1e74e378c6 (diff)
downloadlinux-3.10-af88b9078d4aa31d667d2d82601ede9cae3bac37.tar.gz
linux-3.10-af88b9078d4aa31d667d2d82601ede9cae3bac37.tar.bz2
linux-3.10-af88b9078d4aa31d667d2d82601ede9cae3bac37.zip
mac80211: handle failed scan requests in STA mode
If cfg80211 requests a scan it awaits either a return code != 0 from the scan function or the cfg80211_scan_done to be called. In case of a STA mac80211's scan function ever returns 0 and queues the scan request. If ieee80211_sta_work is executed and ieee80211_start_scan fails for some reason cfg80211_scan_done will never be called but cfg80211 still thinks the scan was triggered successfully and will refuse any future scan requests due to drv->scan_req not being cleaned up. If a scan is triggered from within the MLME a similar problem appears. If ieee80211_start_scan returns an error, local->scan_req will not be reset and mac80211 will refuse any future scan requests. Hence, in both cases call ieee80211_scan_failed (which notifies cfg80211 and resets local->scan_req) if ieee80211_start_scan returns an error. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 0e81e1633a6..5030a3c8750 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -202,6 +202,18 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
return RX_QUEUED;
}
+void ieee80211_scan_failed(struct ieee80211_local *local)
+{
+ if (WARN_ON(!local->scan_req))
+ return;
+
+ /* notify cfg80211 about the failed scan */
+ if (local->scan_req != &local->int_scan_req)
+ cfg80211_scan_done(local->scan_req, true);
+
+ local->scan_req = NULL;
+}
+
void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
{
struct ieee80211_local *local = hw_to_local(hw);