summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@qca.qualcomm.com>2012-07-12 22:49:20 +0400
committerJohannes Berg <johannes.berg@intel.com>2012-07-17 14:16:40 +0400
commitf8a1c774570ab50f1657083c990b968d5f7f22cb (patch)
tree51bed08b4510199daf76709e24a1f49030a1a6d0 /net
parentbfead0808c3b1fff3b94daceef0a0a48e73c42a9 (diff)
downloadlinux-f8a1c774570ab50f1657083c990b968d5f7f22cb.tar.xz
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')
-rw-r--r--net/wireless/core.c1
-rw-r--r--net/wireless/reg.c6
-rw-r--r--net/wireless/reg.h1
3 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 58485964e50b..31b40cc4a9c3 100644
--- 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 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,
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 f36b15fb4592..f023c8a31c60 100644
--- 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);
/**