summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-04-08 16:34:49 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-04-08 16:40:04 -0400
commitace5d5de6bbaff00d3b5dd7ea8f160b570fdb726 (patch)
treead3f1d425e4feb66e00702c1c8f512548fff7803 /drivers
parentf74cb0f7b1d8d6e4c11c6679a7d012be641225e3 (diff)
downloadblackbird-op-linux-ace5d5de6bbaff00d3b5dd7ea8f160b570fdb726.tar.gz
blackbird-op-linux-ace5d5de6bbaff00d3b5dd7ea8f160b570fdb726.zip
ath5k: fixup some merge damage for AR5211 IQ calibration
Resolution of a merge conflict upstream accidentally removed a hunk of "ath5k: IQ calibration for AR5211 is slightly different", so restore it. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath5k/phy.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 4a49dbb17352..60873a4f6171 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -1388,7 +1388,10 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,
i_coff = (-iq_corr) / i_coffd;
i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */
- q_coff = (i_pwr / q_coffd) - 128;
+ if (ah->ah_version == AR5K_AR5211)
+ q_coff = (i_pwr / q_coffd) - 64;
+ else
+ q_coff = (i_pwr / q_coffd) - 128;
q_coff = clamp(q_coff, -16, 15); /* signed 5 bit */
ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_CALIBRATE,
OpenPOWER on IntegriCloud