summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-07-18 12:42:58 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-07-24 16:54:11 +0200
commit3aa569c3fedbd0d16041d08bf6e89b8c43aee650 (patch)
treec7841c94c5546a674f98fedd4715006222b279c9 /net
parentNFC: NCI module license 'unspecified' taints kernel (diff)
downloadlinux-3aa569c3fedbd0d16041d08bf6e89b8c43aee650.tar.xz
linux-3aa569c3fedbd0d16041d08bf6e89b8c43aee650.zip
mac80211: fix scan_sdata assignment
We need to use RCU to assign scan_sdata. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 169da0742c81..7644181cb6b4 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -304,7 +304,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;