From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 22 Jul 2010 11:58:51 +0000 (+0200)
Subject: mac80211: remove bogus rcu_read_lock()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=66c524210ab9217528b01b63c43903545e03a58c;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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>
---

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;
 }