summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez2010-01-07 23:24:56 +0100
committerJohn W. Linville2010-01-12 19:57:58 +0100
commit08030db6e5275dda19ea1b3ab8a41c992799db4a (patch)
tree3487187c4a47d4fbf24e56a5647d37a279287504 /net/wireless
parentcfg80211: add debug print when we drop a bogus country IE (diff)
downloadkernel-qcow2-linux-08030db6e5275dda19ea1b3ab8a41c992799db4a.tar.gz
kernel-qcow2-linux-08030db6e5275dda19ea1b3ab8a41c992799db4a.tar.xz
kernel-qcow2-linux-08030db6e5275dda19ea1b3ab8a41c992799db4a.zip
cfg80211: process the max power on a country IE
The max power from each country IE triplet was being ignored. This fix isn't critical as CRDA was always being used for the lower limit, but we should process it in case the AP still wants to decrease power output even more for whatever reason. Reported-by: Benoit PAPILLAULT <benoit.papillault@free.fr> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 389247cb7059..77d0bb6f6e7a 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -680,7 +680,7 @@ static struct ieee80211_regdomain *country_ie_2_rd(
*/
freq_range->max_bandwidth_khz = MHZ_TO_KHZ(40);
power_rule->max_antenna_gain = DBI_TO_MBI(100);
- power_rule->max_eirp = DBM_TO_MBM(100);
+ power_rule->max_eirp = DBM_TO_MBM(triplet->chans.max_power);
country_ie += 3;
country_ie_len -= 3;