leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cfg80211: move core reg_notfier() check to source

Browse Source 
Drivers that set the WIPHY_FLAG_CUSTOM_REGULATORY skip
the core world regulatory domain updates, but do want
their reg_notifier() called. Move the check for this
closer to the source of the check that detected skipped
was required and while at it add a helper for the notifier
calling. This has no functional changes. This brings together
the place where we call the reg_notifier() will be called.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Luis R. Rodriguez 2013-11-05 09:18:12 -08:00 committed by Johannes Berg
parent f75c30ef08
commit 0e3802dbfe
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/wireless/reg.c
View File

@ -1222,14 +1222,30 @@ static void reg_process_ht_flags(struct wiphy *wiphy)
reg_process_ht_flags_band(wiphy, wiphy->bands[band]); reg_process_ht_flags_band(wiphy, wiphy->bands[band]);
} }
static void reg_call_notifier(struct wiphy *wiphy,
struct regulatory_request *request)
{
if (wiphy->reg_notifier)
wiphy->reg_notifier(wiphy, request);
}
static void wiphy_update_regulatory(struct wiphy *wiphy, static void wiphy_update_regulatory(struct wiphy *wiphy,
enum nl80211_reg_initiator initiator) enum nl80211_reg_initiator initiator)
{ {
enum ieee80211_band band; enum ieee80211_band band;
struct regulatory_request *lr = get_last_request(); struct regulatory_request *lr = get_last_request();
if (ignore_reg_update(wiphy, initiator)) if (ignore_reg_update(wiphy, initiator)) {
/*
* Regulatory updates set by CORE are ignored for custom
* regulatory cards. Let us notify the changes to the driver,
* as some drivers used this to restore its orig_* reg domain.
*/
if (initiator == NL80211_REGDOM_SET_BY_CORE &&
wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)
reg_call_notifier(wiphy, lr);
return; return;
}
lr->dfs_region = get_cfg80211_regdom()->dfs_region; lr->dfs_region = get_cfg80211_regdom()->dfs_region;
@ -1238,9 +1254,7 @@ static void wiphy_update_regulatory(struct wiphy *wiphy,
reg_process_beacons(wiphy); reg_process_beacons(wiphy);
reg_process_ht_flags(wiphy); reg_process_ht_flags(wiphy);
reg_call_notifier(wiphy, lr);
if (wiphy->reg_notifier)
wiphy->reg_notifier(wiphy, lr);
} }
static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator) static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
@ -1253,15 +1267,6 @@ static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator)
list_for_each_entry(rdev, &cfg80211_rdev_list, list) { list_for_each_entry(rdev, &cfg80211_rdev_list, list) {
wiphy = &rdev->wiphy; wiphy = &rdev->wiphy;
wiphy_update_regulatory(wiphy, initiator); wiphy_update_regulatory(wiphy, initiator);
/*
* Regulatory updates set by CORE are ignored for custom
* regulatory cards. Let us notify the changes to the driver,
* as some drivers used this to restore its orig_* reg domain.
*/
if (initiator == NL80211_REGDOM_SET_BY_CORE &&
wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY &&
wiphy->reg_notifier)
wiphy->reg_notifier(wiphy, get_last_request());
} }
} }