summaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2014-01-29 07:56:21 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-02-04 21:58:11 +0100
commitdbd72850dcc9738b42a9762ef8c4a1a66b30d897 (patch)
tree11a1f250e7af7bdeaa8f154762522b8a7db0deb8 /net/mac80211/iface.c
parentcc901de1bcb0372583466075bfa62e3049dc6288 (diff)
downloadlinux-dbd72850dcc9738b42a9762ef8c4a1a66b30d897.tar.bz2
mac80211: add missing CSA locking
The patch adds a missing sdata lock and adds a few lockdeps for easier maintenance. Signed-off-by: Michal Kazior <michal.kazior@tieto.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 3dfd20a453ab..8880bc8fce0d 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -822,7 +822,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
cancel_work_sync(&local->dynamic_ps_enable_work);
cancel_work_sync(&sdata->recalc_smps);
+ sdata_lock(sdata);
sdata->vif.csa_active = false;
+ sdata_unlock(sdata);
cancel_work_sync(&sdata->csa_finalize_work);
cancel_delayed_work_sync(&sdata->dfs_cac_timer_work);