evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ath: Disable non-20 mhz 2G world regulatory channels"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-05 22:32:51 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2dedf76547
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/wireless/ath/regd.c
View file

@ -631,6 +631,8 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
struct regulatory_request *request)) struct regulatory_request *request))
{ {
const struct ieee80211_regdomain *regd; const struct ieee80211_regdomain *regd;
u32 chan_num;
struct ieee80211_channel *chan;
wiphy->reg_notifier = reg_notifier; wiphy->reg_notifier = reg_notifier;
wiphy->regulatory_flags |= REGULATORY_STRICT_REG | wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
@ -653,6 +655,20 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
} }
wiphy_apply_custom_regulatory(wiphy, regd); wiphy_apply_custom_regulatory(wiphy, regd);
/* For regulatory rules similar to the following:
* REG_RULE(2412-10, 2462+10, 40, 0, 20, 0), channels 12/13 are enabled
* due to support of 5/10 MHz.
* Therefore, disable 2.4 Ghz channels that dont have 20 mhz bw
*/
for (chan_num = 0;
chan_num < wiphy->bands[IEEE80211_BAND_2GHZ]->n_channels;
chan_num++) {
chan = &wiphy->bands[IEEE80211_BAND_2GHZ]->channels[chan_num];
if (chan->flags & IEEE80211_CHAN_NO_20MHZ)
chan->flags |= IEEE80211_CHAN_DISABLED;
}
ath_reg_apply_radar_flags(wiphy); ath_reg_apply_radar_flags(wiphy);
ath_reg_apply_world_flags(wiphy, NL80211_REGDOM_SET_BY_DRIVER, reg); ath_reg_apply_world_flags(wiphy, NL80211_REGDOM_SET_BY_DRIVER, reg);
return 0; return 0;