summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-09-11 10:17:11 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-09-14 14:09:25 +0200
commit5d8e4237d2dc73b51ac66dc612c5c42dd7424479 (patch)
tree7682e303361f1400abf693a465db672d864f227d /net/mac80211/cfg.c
parent04b7b2ff50fc77380c1e711f1d7223734547e41b (diff)
downloadblackbird-op-linux-5d8e4237d2dc73b51ac66dc612c5c42dd7424479.tar.gz
blackbird-op-linux-5d8e4237d2dc73b51ac66dc612c5c42dd7424479.zip
mac80211: change locking around ieee80211_recalc_smps
Make the function acquire the necessary mutex itself to simplify the callers. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 00e31b488adc..9bd56a744982 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2070,9 +2070,7 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata,
*/
if (!sdata->u.mgd.associated ||
sdata->vif.bss_conf.channel_type == NL80211_CHAN_NO_HT) {
- mutex_lock(&sdata->local->iflist_mtx);
ieee80211_recalc_smps(sdata->local);
- mutex_unlock(&sdata->local->iflist_mtx);
return 0;
}
OpenPOWER on IntegriCloud