summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Lindner2011-08-03 16:35:16 +0200
committerJohn W. Linville2011-08-12 19:45:02 +0200
commitf3d4505de539f754b78d5c30e5d2cb41a0ed0117 (patch)
tree31ddc2f430b0c6068a1ebc6fff4effd1d221d1fb
parentnl80211/cfg80211: Make addition of new sinfo fields safer (diff)
downloadkernel-qcow2-linux-f3d4505de539f754b78d5c30e5d2cb41a0ed0117.tar.gz
kernel-qcow2-linux-f3d4505de539f754b78d5c30e5d2cb41a0ed0117.tar.xz
kernel-qcow2-linux-f3d4505de539f754b78d5c30e5d2cb41a0ed0117.zip
ath9k: remove eeprom txgain override for minor version < 19
ath9k_hw_4k_get_eeprom() overrides the eeprom value for txgain if the minor version is not 19 or above with a value of 0. ar9002_hw_init_mode_gain_regs() relies on this information to determine whether this is a high power wifi card or not. The override caused the driver to always use the 'normal' power tables even for high power devices if their minor version was not high enough. Thus leading to reduced power output. This isn't needed for the AR9285; the check originated with the AR9280 setup code which requires the EEPROM version check. Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Acked-by: Felix Fietkau <nbd@openwrt.org> Acked-by: Adrian Chadd <adrian@freebsd.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/eeprom_4k.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 1c6ce0442e2f..ea658e794cbd 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -349,10 +349,7 @@ static u32 ath9k_hw_4k_get_eeprom(struct ath_hw *ah,
case EEP_ANT_DIV_CTL1:
return pModal->antdiv_ctl1;
case EEP_TXGAIN_TYPE:
- if (ver_minor >= AR5416_EEP_MINOR_VER_19)
- return pBase->txGainType;
- else
- return AR5416_EEP_TXGAIN_ORIGINAL;
+ return pBase->txGainType;
default:
return 0;
}