From a4d669acc6b792ea8cf922b1cb8cf1f2a3b97cab Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 21 Oct 2008 09:57:41 +0200
Subject: [PATCH] --- yaml --- r: 121623 b: refs/heads/master c:
 f3b407fba52e1b86ca286ee7c218a4fb00bd29e0 h: refs/heads/master i:   121621:
 5b0a2acfc4f3977dfafb093b45ba60938dd6fd76   121619:
 c13b11b99dd634efb43ab5e4616eec1c7499ef80   121615:
 809bae191ed383dbaf6ce23ca5c36dab97c90e40 v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/core.c | 6 ++----
 trunk/net/wireless/reg.c  | 3 ---
 trunk/net/wireless/reg.h  | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d60ea13b5b2d..570154e0f021 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf03268e6ed6cfacaa5e32db41ea832c4d10438b
+refs/heads/master: f3b407fba52e1b86ca286ee7c218a4fb00bd29e0
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
index 5031db7b275b..72825afe2bf6 100644
--- a/trunk/net/wireless/core.c
+++ b/trunk/net/wireless/core.c
@@ -301,12 +301,10 @@ int wiphy_register(struct wiphy *wiphy)
 	/* check and set up bitrates */
 	ieee80211_set_bitrate_flags(wiphy);
 
+	mutex_lock(&cfg80211_drv_mutex);
+
 	/* set up regulatory info */
-	mutex_lock(&cfg80211_reg_mutex);
 	wiphy_update_regulatory(wiphy, REGDOM_SET_BY_CORE);
-	mutex_unlock(&cfg80211_reg_mutex);
-
-	mutex_lock(&cfg80211_drv_mutex);
 
 	res = device_add(&drv->wiphy.dev);
 	if (res)
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 626dbb688499..581273d86844 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -52,7 +52,6 @@ struct regulatory_request {
 };
 
 static LIST_HEAD(regulatory_requests);
-DEFINE_MUTEX(cfg80211_reg_mutex);
 
 /* To trigger userspace events */
 static struct platform_device *reg_pdev;
@@ -63,8 +62,6 @@ static u32 supported_bandwidths[] = {
 	MHZ_TO_KHZ(20),
 };
 
-static struct list_head regulatory_requests;
-
 /* Central wireless core regulatory domains, we only need two,
  * the current one and a world regulatory domain in case we have no
  * information to give us an alpha2 */
diff --git a/trunk/net/wireless/reg.h b/trunk/net/wireless/reg.h
index a4845b140a84..0c1572b92fef 100644
--- a/trunk/net/wireless/reg.h
+++ b/trunk/net/wireless/reg.h
@@ -1,7 +1,6 @@
 #ifndef __NET_WIRELESS_REG_H
 #define __NET_WIRELESS_REG_H
 
-extern struct mutex cfg80211_reg_mutex;
 bool is_world_regdom(const char *alpha2);
 bool reg_is_valid_request(const char *alpha2);