Browse Source

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>
Stanislaw Gruszka 14 years ago
parent
commit
3aed49ef17
1 changed files with 2 additions and 0 deletions
  1. 2 0
      net/mac80211/scan.c

+ 2 - 0
net/mac80211/scan.c

@@ -665,6 +665,8 @@ void ieee80211_scan_work(struct work_struct *work)
 
 
 		rc = __ieee80211_start_scan(sdata, req);
 		rc = __ieee80211_start_scan(sdata, req);
 		if (rc) {
 		if (rc) {
+			/* need to complete scan in cfg80211 */
+			local->scan_req = req;
 			aborted = true;
 			aborted = true;
 			goto out_complete;
 			goto out_complete;
 		} else
 		} else