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>
This commit is contained in:
Luis R. Rodriguez 2012-07-12 11:49:20 -07:00 committed by Johannes Berg
parent bfead0808c
commit f8a1c77457
3 changed files with 4 additions and 4 deletions

View File

@ -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++;

View File

@ -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 */

View File

@ -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);
/**