aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-09-11 04:17:11 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-09-14 08:09:25 -0400
commit5d8e4237d2dc73b51ac66dc612c5c42dd7424479 (patch)
tree7682e303361f1400abf693a465db672d864f227d /net/mac80211/main.c
parent04b7b2ff50fc77380c1e711f1d7223734547e41b (diff)
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/main.c')
-rw-r--r--net/mac80211/main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 416e85eae2d2..c80c4490351c 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -364,9 +364,7 @@ static void ieee80211_recalc_smps_work(struct work_struct *work)
364 struct ieee80211_local *local = 364 struct ieee80211_local *local =
365 container_of(work, struct ieee80211_local, recalc_smps); 365 container_of(work, struct ieee80211_local, recalc_smps);
366 366
367 mutex_lock(&local->iflist_mtx);
368 ieee80211_recalc_smps(local); 367 ieee80211_recalc_smps(local);
369 mutex_unlock(&local->iflist_mtx);
370} 368}
371 369
372#ifdef CONFIG_INET 370#ifdef CONFIG_INET