From fb9274b81360dd596abf4b55f9180511e6dedc4b Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
Date: Thu, 12 Jul 2012 11:49:20 -0700
Subject: [PATCH] --- yaml --- r: 315585 b: refs/heads/master c:
 f8a1c774570ab50f1657083c990b968d5f7f22cb h: refs/heads/master i:   315583:
 256e6f135e4a80986bac02c0bdf930aca507d184 v: v3

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

diff --git a/[refs] b/[refs]
index f86d8ea5b390..c11aba6bcce7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfead0808c3b1fff3b94daceef0a0a48e73c42a9
+refs/heads/master: f8a1c774570ab50f1657083c990b968d5f7f22cb
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
index 58485964e50b..31b40cc4a9c3 100644
--- a/trunk/net/wireless/core.c
+++ b/trunk/net/wireless/core.c
@@ -543,7 +543,6 @@ int wiphy_register(struct wiphy *wiphy)
 
 	/* set up regulatory info */
 	wiphy_regulatory_register(wiphy);
-	regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
 
 	list_add_rcu(&rdev->list, &cfg80211_rdev_list);
 	cfg80211_rdev_list_generation++;
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 50604fd14cd2..be6880fd1987 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1232,8 +1232,8 @@ static void wiphy_update_regulatory(struct wiphy *wiphy,
 		wiphy->reg_notifier(wiphy, last_request);
 }
 
-void regulatory_update(struct wiphy *wiphy,
-		       enum nl80211_reg_initiator setby)
+static void regulatory_update(struct wiphy *wiphy,
+			      enum nl80211_reg_initiator setby)
 {
 	mutex_lock(&reg_mutex);
 	wiphy_update_regulatory(wiphy, setby);
@@ -2388,6 +2388,8 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
 		reg_num_devs_support_basehint++;
 
 	mutex_unlock(&reg_mutex);
+
+	regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
 }
 
 /* Caller must hold cfg80211_mutex */
diff --git a/trunk/net/wireless/reg.h b/trunk/net/wireless/reg.h
index f36b15fb4592..f023c8a31c60 100644
--- a/trunk/net/wireless/reg.h
+++ b/trunk/net/wireless/reg.h
@@ -34,7 +34,6 @@ void regulatory_exit(void);
 
 int set_regdom(const struct ieee80211_regdomain *rd);
 
-void regulatory_update(struct wiphy *wiphy, enum nl80211_reg_initiator setby);
 bool reg_last_request_cell_base(void);
 
 /**