projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'wireless/master' into mac80211
[firefly-linux-kernel-4.4.55.git]
/
net
/
mac80211
/
scan.c
diff --git
a/net/mac80211/scan.c
b/net/mac80211/scan.c
index bcaee5d1283915efdbc8c63f4365c7ed42d486dc..df36280ed78fd06e5cb7799c8cc46be275d42df1 100644
(file)
--- a/
net/mac80211/scan.c
+++ b/
net/mac80211/scan.c
@@
-299,7
+299,7
@@
static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted,
if (local->scan_req != local->int_scan_req)
cfg80211_scan_done(local->scan_req, aborted);
local->scan_req = NULL;
-
local->scan_sdata = NULL
;
+
rcu_assign_pointer(local->scan_sdata, NULL)
;
local->scanning = 0;
local->scan_channel = NULL;