Skip to content

Commit

Permalink
mac80211: compete scan to cfg80211 if deferred scan fail to start
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stanislaw Gruszka authored and John W. Linville committed Oct 6, 2010
1 parent 6eb11a9 commit 3aed49e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/mac80211/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3aed49e

Please sign in to comment.