From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 5 Jul 2016 12:23:13 +0000 (+0300)
Subject: mac80211: report failure to start (partial) scan as scan abort
X-Git-Tag: v4.8-rc1~140^2~167^2~2
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=7d10f6b179bc82e6633a4521a4cd69ad6846723e

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>
---

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);