summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2014-02-04 08:37:54 +0530
committerJohn W. Linville <linville@tuxdriver.com>2014-02-04 15:30:07 -0500
commit4cfe9a8d58292dc8e32a8093a95187d47507d394 (patch)
tree564c3a7d613f5d5ed1b8b84de0c7886f4cb3b732 /drivers
parent8298383c2cd5a6d0639f1bb1781fba181bd20154 (diff)
downloadlinux-stable-4cfe9a8d58292dc8e32a8093a95187d47507d394.tar.gz
linux-stable-4cfe9a8d58292dc8e32a8093a95187d47507d394.tar.bz2
linux-stable-4cfe9a8d58292dc8e32a8093a95187d47507d394.zip
ath9k: Fix TX power calculation
The commit, "ath9k_hw: Fix incorrect Tx control power in AR9003 template" fixed the incorrect values in the eeprom templates, but if boards have already been calibrated with incorrect values, they would still be using the wrong TX power. Fix this by assigning a default value in such cases. Cc: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_eeprom.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 25243cbc07f0..b8daff78b9d1 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -5065,6 +5065,10 @@ static u16 ar9003_hw_get_max_edge_power(struct ar9300_eeprom *eep,
break;
}
}
+
+ if (is2GHz && !twiceMaxEdgePower)
+ twiceMaxEdgePower = 60;
+
return twiceMaxEdgePower;
}