From a939e7472d5a7d7c425c477e10c3977188dd6854 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
Date: Thu, 12 Jul 2012 11:49:21 -0700
Subject: [PATCH] --- yaml --- r: 315586 b: refs/heads/master c:
 14cdf112019c1d4bc0f1bf9a9c832be641dbe25a h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/net/wireless/reg.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c11aba6bcce7..39839d0e89c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8a1c774570ab50f1657083c990b968d5f7f22cb
+refs/heads/master: 14cdf112019c1d4bc0f1bf9a9c832be641dbe25a
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index be6880fd1987..dbb01df3aacb 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1232,14 +1232,6 @@ static void wiphy_update_regulatory(struct wiphy *wiphy,
 		wiphy->reg_notifier(wiphy, last_request);
 }
 
-static void regulatory_update(struct wiphy *wiphy,
-			      enum nl80211_reg_initiator setby)
-{
-	mutex_lock(&reg_mutex);
-	wiphy_update_regulatory(wiphy, setby);
-	mutex_unlock(&reg_mutex);
-}
-
 static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
 {
 	struct cfg80211_registered_device *rdev;
@@ -2387,9 +2379,9 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
 	if (!reg_dev_ignore_cell_hint(wiphy))
 		reg_num_devs_support_basehint++;
 
-	mutex_unlock(&reg_mutex);
+	wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE);
 
-	regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
+	mutex_unlock(&reg_mutex);
 }
 
 /* Caller must hold cfg80211_mutex */