summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2010-10-06 11:22:12 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-10-06 16:30:42 -0400
commit3aed49ef17c7bc8397420529ac976fe058818e3d (patch)
tree28b3a316332cc35bf69461e76415052de8d53d3f /net/mac80211
parent6eb11a9a311a0f7e5b9b66c18f7498a26c9ec206 (diff)
downloadlinux-3.10-3aed49ef17c7bc8397420529ac976fe058818e3d.tar.gz
linux-3.10-3aed49ef17c7bc8397420529ac976fe058818e3d.tar.bz2
linux-3.10-3aed49ef17c7bc8397420529ac976fe058818e3d.zip
mac80211: compete scan to cfg80211 if deferred scan fail to start
We nulify local->scan_req on failure in __ieee80211_start_scan, so __ieee80211_scan_completed will not call cfg80211_scan_done. Fix that. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/scan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 9aab921f7ca..80e017df5f3 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -665,6 +665,8 @@ void ieee80211_scan_work(struct work_struct *work)
rc = __ieee80211_start_scan(sdata, req);
if (rc) {
+ /* need to complete scan in cfg80211 */
+ local->scan_req = req;
aborted = true;
goto out_complete;
} else