diff options
| author | Anton Arapov <anton@redhat.com> | 2012-09-12 09:18:33 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-09-12 09:19:26 +0200 |
| commit | 985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2 (patch) | |
| tree | eb9091ebd60e14eea65a9e6b5140f98d88e8a590 /net/wireless/reg.c | |
| parent | 1d44b6f3fcf6058fb7c960b7558766967e8028f7 (diff) | |
| download | kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.tar.gz kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.tar.xz kernel-uprobes-985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2.zip | |
fedora kernel: 021ce7bee3cfdcbf16da1256b2c9f40f7e9bbd9ev3.5.3-1
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index baf5704740e..460af03d814 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -891,7 +891,21 @@ static void handle_channel(struct wiphy *wiphy, chan->max_antenna_gain = min(chan->orig_mag, (int) MBI_TO_DBI(power_rule->max_antenna_gain)); chan->max_reg_power = (int) MBM_TO_DBM(power_rule->max_eirp); - chan->max_power = min(chan->max_power, chan->max_reg_power); + if (chan->orig_mpwr) { + /* + * Devices that have their own custom regulatory domain + * but also use WIPHY_FLAG_STRICT_REGULATORY will follow the + * passed country IE power settings. + */ + if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE && + wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY && + wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY) + chan->max_power = chan->max_reg_power; + else + chan->max_power = min(chan->orig_mpwr, + chan->max_reg_power); + } else + chan->max_power = chan->max_reg_power; } static void handle_band(struct wiphy *wiphy, |