summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-07-22 13:58:51 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-07-26 15:32:41 -0400
commit66c524210ab9217528b01b63c43903545e03a58c (patch)
tree3d3f519fc5f0230618fca12012b851bfd76947fb /net
parentf9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37 (diff)
downloadlinux-66c524210ab9217528b01b63c43903545e03a58c.tar.bz2
mac80211: remove bogus rcu_read_lock()
Another remnant of the previous key locking scheme needs to be removed -- this causes a warning otherwise as ieee80211_set_default_mgmt_key will acquire a mutex. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 35b07ea0633a..db82da90df76 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -324,15 +324,10 @@ static int ieee80211_config_default_mgmt_key(struct wiphy *wiphy,
struct net_device *dev,
u8 key_idx)
{
- struct ieee80211_sub_if_data *sdata;
-
- rcu_read_lock();
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
- sdata = IEEE80211_DEV_TO_SUB_IF(dev);
ieee80211_set_default_mgmt_key(sdata, key_idx);
- rcu_read_unlock();
-
return 0;
}