summaryrefslogtreecommitdiffstats
path: root/net/mac80211/debugfs_netdev.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-04-19 20:44:04 +0200
committerJohn W. Linville <linville@tuxdriver.com>2011-04-20 16:05:59 -0400
commit243e6df4ed919880d079d717641ad699c6530a03 (patch)
treedafe7720e68fcb8e9ce1d5d871386b9e6380f67b /net/mac80211/debugfs_netdev.c
parent10e99777e926907e43fa57ec1208c3f7787fd290 (diff)
downloadop-kernel-dev-243e6df4ed919880d079d717641ad699c6530a03.zip
op-kernel-dev-243e6df4ed919880d079d717641ad699c6530a03.tar.gz
mac80211: fix SMPS debugfs locking
The locking with SMPS requests means that the debugs file should lock the mgd mutex, not the iflist mutex. Calls to __ieee80211_request_smps() need to hold that mutex, so add an assertion. This has always been wrong, but for some reason never been noticed, probably because the locking error only happens while unassociated. Cc: stable@kernel.org [2.6.34+] Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/debugfs_netdev.c')
-rw-r--r--net/mac80211/debugfs_netdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index dacace6..9ea7c0d 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -177,9 +177,9 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,
if (sdata->vif.type != NL80211_IFTYPE_STATION)
return -EOPNOTSUPP;
- mutex_lock(&local->iflist_mtx);
+ mutex_lock(&sdata->u.mgd.mtx);
err = __ieee80211_request_smps(sdata, smps_mode);
- mutex_unlock(&local->iflist_mtx);
+ mutex_unlock(&sdata->u.mgd.mtx);
return err;
}
OpenPOWER on IntegriCloud