diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-09-06 15:55:50 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-06 15:56:02 +0200 |
| commit | 944b9e375d89271c39995d363f62cb91734fae5f (patch) | |
| tree | bd6014bd0be251cdf2b32b12ca8a62e55742c0ee /net/mac80211/scan.c | |
| parent | a4ed53466a289a4139405bf7190c78a8e9d8debf (diff) | |
| parent | 7ce8c7a3433c6d6f4adfec0611d250782f0b4b0c (diff) | |
Merge remote-tracking branch 'mac80211/master' into mac80211-next
Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index ef1d6930631..740e414d44f 100644 --- 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; @@ -984,7 +984,6 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata) kfree(local->sched_scan_ies.ie[i]); drv_sched_scan_stop(local, sdata); - rcu_assign_pointer(local->sched_scan_sdata, NULL); } out: mutex_unlock(&local->mtx); |