diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-20 15:02:02 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-20 15:02:02 -0500 |
| commit | 88daf80dcca19ff995cc263592426f734a9702f3 (patch) | |
| tree | 7a52e25df74e52d00c3821032e719244e8a5526f /net/mac80211/iface.c | |
| parent | 010d3c3989706d800ae72253773fa6537cc9f74c (diff) | |
| parent | 35582ad9d342025653aaf28ed321bf5352488d7f (diff) | |
| download | blackbird-op-linux-88daf80dcca19ff995cc263592426f734a9702f3.tar.gz blackbird-op-linux-88daf80dcca19ff995cc263592426f734a9702f3.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index ce1c44370610..088111af6c7c 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -833,7 +833,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); |
