dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

cfg80211: remove regulatory_update() 

regulatory_update() just calls wiphy_update_regulatory().
wiphy_update_regulatory() assumes you already have
the reg_mutex held so just move the call within locking
context and kill the superfluous regulatory_update().

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:21 -07:00 committed by Johannes Berg
parent f8a1c77457
commit 14cdf11201
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/wireless/reg.c
View File

@ -1232,14 +1232,6 @@ static void wiphy_update_regulatory(struct wiphy *wiphy,
wiphy->reg_notifier(wiphy, last_request);
}
static void regulatory_update(struct wiphy *wiphy,
enum nl80211_reg_initiator setby)
{
mutex_lock(&reg_mutex);
wiphy_update_regulatory(wiphy, setby);
mutex_unlock(&reg_mutex);
}
static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
{
struct cfg80211_registered_device *rdev;
@ -2387,9 +2379,9 @@ void wiphy_regulatory_register(struct wiphy *wiphy)
if (!reg_dev_ignore_cell_hint(wiphy))
reg_num_devs_support_basehint++;
mutex_unlock(&reg_mutex);
wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE);
regulatory_update(wiphy, NL80211_REGDOM_SET_BY_CORE);
mutex_unlock(&reg_mutex);
}
/* Caller must hold cfg80211_mutex */