---

yaml --- r: 315585 b: refs/heads/master c: f8a1c77 h: refs/heads/master i: 315583: 256e6f1 v: v3
git-mirror · Jul 17, 2012 · fb9274b · fb9274b
1 parent fcd90d7
commit fb9274b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     /**
@@ Expand Down @@