cfg80211: make regulatory_update() static

Now that we have wiphy_regulatory_register() we can
tuck away the core's regulatory_update() call there
and make it static.

Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 58485964e50b39488d17ea7a9d07af5ee9a90e5f..31b40cc4a9c3c59bac7986e3c5c8725153381179 100644 (file)
--- a/net/wireless/core.c
+++ b/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/net/wireless/reg.c b/net/wireless/reg.c
index 50604fd14cd2c58eed234794150c06dc50c47f59..be6880fd198750b4dcb38f00eeb909b0a9bbc3b2 100644 (file)
--- a/net/wireless/reg.c
+++ b/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/net/wireless/reg.h b/net/wireless/reg.h
index f36b15fb4592f3b8490c121630e498986ed46574..f023c8a31c60bc82ad54659957169cd0d974d074 100644 (file)
--- a/net/wireless/reg.h
+++ b/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);
 
 /**