提交 6924d013 编写于 作者: J Johannes Berg

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: NSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
上级 5fe2bb86
...@@ -2903,10 +2903,8 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy, ...@@ -2903,10 +2903,8 @@ static int ieee80211_start_radar_detection(struct wiphy *wiphy,
sdata->needed_rx_chains = local->rx_chains; sdata->needed_rx_chains = local->rx_chains;
sdata->radar_required = true; sdata->radar_required = true;
mutex_lock(&local->iflist_mtx);
err = ieee80211_vif_use_channel(sdata, chandef, err = ieee80211_vif_use_channel(sdata, chandef,
IEEE80211_CHANCTX_SHARED); IEEE80211_CHANCTX_SHARED);
mutex_unlock(&local->iflist_mtx);
if (err) if (err)
return err; return err;
......
...@@ -826,9 +826,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ...@@ -826,9 +826,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
if (sdata->wdev.cac_started) { if (sdata->wdev.cac_started) {
chandef = sdata->vif.bss_conf.chandef; chandef = sdata->vif.bss_conf.chandef;
WARN_ON(local->suspended); WARN_ON(local->suspended);
mutex_lock(&local->iflist_mtx);
ieee80211_vif_release_channel(sdata); ieee80211_vif_release_channel(sdata);
mutex_unlock(&local->iflist_mtx);
cfg80211_cac_event(sdata->dev, &chandef, cfg80211_cac_event(sdata->dev, &chandef,
NL80211_RADAR_CAC_ABORTED, NL80211_RADAR_CAC_ABORTED,
GFP_KERNEL); GFP_KERNEL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册