aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/reg.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@qca.qualcomm.com>2012-07-12 14:49:20 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-07-17 06:16:40 -0400
commitf8a1c774570ab50f1657083c990b968d5f7f22cb (patch)
tree51bed08b4510199daf76709e24a1f49030a1a6d0 /net/wireless/reg.c
parentbfead0808c3b1fff3b94daceef0a0a48e73c42a9 (diff)
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>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r--net/wireless/reg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 50604fd14cd2..be6880fd1987 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1232,8 +1232,8 @@ static void wiphy_update_regulatory(struct wiphy *wiphy,
1232 wiphy->reg_notifier(wiphy, last_request); 1232 wiphy->reg_notifier(wiphy, last_request);
1233} 1233}
1234 1234
1235void regulatory_update(struct wiphy *wiphy, 1235static void regulatory_update(struct wiphy *wiphy,
1236 enum nl80211_reg_initiator setby) 1236 enum nl80211_reg_initiator setby)
1237{ 1237{
1238 mutex_lock(&reg_mutex); 1238 mutex_lock(&reg_mutex);
1239 wiphy_update_regulatory(wiphy, setby); 1239 wiphy_update_regulatory(wiphy, setby);
@@ -2388,6 +2388,8 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
2388 reg_num_devs_support_basehint++; 2388 reg_num_devs_support_basehint++;
2389 2389
2390 mutex_unlock(&reg_mutex); 2390 mutex_unlock(&reg_mutex);
2391
2392 regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
2391} 2393}
2392 2394
2393/* Caller must hold cfg80211_mutex */ 2395/* Caller must hold cfg80211_mutex */