OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7947d3e
)
mac80211: report failure to start (partial) scan as scan abort
author
Johannes Berg
<johannes.berg@intel.com>
Tue, 5 Jul 2016 12:23:13 +0000
(15:23 +0300)
committer
Johannes Berg
<johannes.berg@intel.com>
Wed, 6 Jul 2016 12:54:38 +0000
(14:54 +0200)
Rather than reporting the scan as having completed, report it as
being aborted.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/scan.c
patch
|
blob
|
history
diff --git
a/net/mac80211/scan.c
b/net/mac80211/scan.c
index
8d4a9cd
..
070b40f
100644
(file)
--- 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);