From 031972115a8b164836a49d5ec1c5c0fe51da8275 Mon Sep 17 00:00:00 2001 From: Luis R. Rodriguez Date: Thu, 7 Jan 2010 17:24:56 -0500 Subject: [PATCH 4/8] cfg80211: process the max power on a country IE commit 08030db6e5275dda19ea1b3ab8a41c992799db4a upstream. 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 Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville --- net/wireless/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 7e6c3d8..7bfa5ab 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -658,7 +658,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; -- 1.6.3.3