From 0289dc585d60328da13637ece3a2af5d01c3d768 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 22 Jul 2010 13:58:51 +0200
Subject: [PATCH] --- yaml --- r: 203811 b: refs/heads/master c:
 66c524210ab9217528b01b63c43903545e03a58c h: refs/heads/master i:   203809:
 9a6dab5611f25d5ca5bb34a87744089af6ec635d   203807:
 965e6ba7ff11f1ef1c0fa547c2887592e1179807 v: v3

---
 [refs]                   | 2 +-
 trunk/net/mac80211/cfg.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b15894c94afe..b9ee497703ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9f9b6e3e3128e2b4d01a6e5ed0bb73cbb9a0a37
+refs/heads/master: 66c524210ab9217528b01b63c43903545e03a58c
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 35b07ea0633a..db82da90df76 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/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;
 }