summaryrefslogtreecommitdiff
path: root/net/wireless/reg.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2010-01-07 22:24:56 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2010-01-12 18:57:58 (GMT)
commit08030db6e5275dda19ea1b3ab8a41c992799db4a (patch)
tree3487187c4a47d4fbf24e56a5647d37a279287504 /net/wireless/reg.c
parentb74d12e116528fadc35f305eb6e9525a3a2b62b1 (diff)
downloadlinux-fsl-qoriq-08030db6e5275dda19ea1b3ab8a41c992799db4a.tar.xz
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/reg.c')
-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 389247c..77d0bb6 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;