提交 d46e5b1d 编写于 作者: L Luis R. Rodriguez 提交者: John W. Linville

cfg80211: move check for ignore_reg_update() on wiphy_update_regulatory()

This ensures that the initial REGDOM_SET_BY_CORE upon wiphy registration
respects the wiphy->custom_regulatory setting. Without this and if OLD_REG
is disabled (which will be default soon as we remove it) the
wiphy->custom_regulatory is simply ignored.
Signed-off-by: NLuis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: NJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 2a44f911
...@@ -937,13 +937,15 @@ static void update_all_wiphy_regulatory(enum reg_set_by setby) ...@@ -937,13 +937,15 @@ static void update_all_wiphy_regulatory(enum reg_set_by setby)
struct cfg80211_registered_device *drv; struct cfg80211_registered_device *drv;
list_for_each_entry(drv, &cfg80211_drv_list, list) list_for_each_entry(drv, &cfg80211_drv_list, list)
if (!ignore_reg_update(&drv->wiphy, setby)) wiphy_update_regulatory(&drv->wiphy, setby);
wiphy_update_regulatory(&drv->wiphy, setby);
} }
void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby) void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby)
{ {
enum ieee80211_band band; enum ieee80211_band band;
if (ignore_reg_update(wiphy, setby))
return;
for (band = 0; band < IEEE80211_NUM_BANDS; band++) { for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (wiphy->bands[band]) if (wiphy->bands[band])
handle_band(wiphy, band); handle_band(wiphy, band);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册