diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-22 22:21:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-22 22:21:38 +0200 |
| commit | 1ed3aad141fe595673c20225a9e004730088be52 (patch) | |
| tree | dec75e69b602e677ba0e5231f2d3036663fbd66a /net/mac80211 | |
| parent | Revert "bridge: Forward reserved group addresses if !STP" (diff) | |
| parent | iwl4965: fix skb usage after free (diff) | |
| download | linux-1ed3aad141fe595673c20225a9e004730088be52.tar.xz linux-1ed3aad141fe595673c20225a9e004730088be52.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/cfg.c | 2 | ||||
| -rw-r--r-- | net/mac80211/debugfs_netdev.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 334213571ad0..44049733c4ea 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1504,6 +1504,8 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata, enum ieee80211_smps_mode old_req; int err; + lockdep_assert_held(&sdata->u.mgd.mtx); + old_req = sdata->u.mgd.req_smps; sdata->u.mgd.req_smps = smps_mode; diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index dacace6b1393..9ea7c0d0103f 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; } |