summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-12-18 19:44:59 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-12-19 13:33:13 +0100
commit6924d0138acdf5026ee4463134d98e139fe025a2 (patch)
tree97ced66fdc8e6652278fc562775ab74128434682 /net
parent5fe2bb8688cad3608f9fe0d0875f9f6ff776ba51 (diff)
downloadlinux-stable-6924d0138acdf5026ee4463134d98e139fe025a2.tar.gz
linux-stable-6924d0138acdf5026ee4463134d98e139fe025a2.tar.bz2
linux-stable-6924d0138acdf5026ee4463134d98e139fe025a2.zip
mac80211: remove unnecessary iflist_mtx locking
The radar detection code changed a few times, and due to the changes some iflist_mtx locking stayed in that isn't actually necessary - remove it. One version of the code needed it because an AP interface's VLAN list was changed to use this, but then we moved the list handling outside of the chanctx handling and thus the locking was no longer needed. Tested-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c2
-rw-r--r--net/mac80211/iface.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ac185286842d..bfe54daab4b1 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2903,10 +2903,8 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy,
sdata->needed_rx_chains = local->rx_chains;
sdata->radar_required = true;
- mutex_lock(&local->iflist_mtx);
err = ieee80211_vif_use_channel(sdata, chandef,
IEEE80211_CHANCTX_SHARED);
- mutex_unlock(&local->iflist_mtx);
if (err)
return err;
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 3d2168c3269e..0c0be9097664 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -826,9 +826,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
if (sdata->wdev.cac_started) {
chandef = sdata->vif.bss_conf.chandef;
WARN_ON(local->suspended);
- mutex_lock(&local->iflist_mtx);
ieee80211_vif_release_channel(sdata);
- mutex_unlock(&local->iflist_mtx);
cfg80211_cac_event(sdata->dev, &chandef,
NL80211_RADAR_CAC_ABORTED,
GFP_KERNEL);