summaryrefslogtreecommitdiff
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2016-07-05 15:23:13 +0300
committerJohannes Berg <johannes.berg@intel.com>2016-07-06 15:54:38 +0300
commit7d10f6b179bc82e6633a4521a4cd69ad6846723e (patch)
treeeaa1f0ebeb4493bd9a787a4da6f33e62b00b73cf /net/mac80211/scan.c
parent7947d3e075cde1a18e538f2dafbc850aa356ff79 (diff)
downloadlinux-7d10f6b179bc82e6633a4521a4cd69ad6846723e.tar.xz
mac80211: report failure to start (partial) scan as scan abort
Rather than reporting the scan as having completed, report it as being aborted. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 8d4a9cd8a39a..070b40f15850 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -362,10 +362,11 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
if (rc == 0)
return;
- /* HW scan failed and is going to be reported as done, so clear
- * old scan info.
+ /* HW scan failed and is going to be reported as aborted,
+ * so clear old scan info.
*/
memset(&local->scan_info, 0, sizeof(local->scan_info));
+ aborted = true;
}
kfree(local->hw_scan_req);