From 8114c3e8a4b92c16823a1e421c6f8cc5f2476e2c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 15 Mar 2013 14:53:31 +0100 Subject: [PATCH] --- yaml --- r: 361815 b: refs/heads/master c: 74632d11a133b5baf6b9d622dd19d2f944d93d94 h: refs/heads/master i: 361813: 0f5f383204b1aef4587bbc26e14a52464c5df4c2 361811: 4329e60a71bb9a01c2d33c94c30779753885792f 361807: aace16e32b0baf165f044993be9c8a2292d73f2e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/ar9003_calib.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6d15656834ff..542560a83e40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f42ace3118afedbd1848a349d01a11d9ca13d41 +refs/heads/master: 74632d11a133b5baf6b9d622dd19d2f944d93d94 diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/trunk/drivers/net/wireless/ath/ath9k/ar9003_calib.c index 4cc13940c895..f76c3ca07a45 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_calib.c +++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_calib.c @@ -1023,6 +1023,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, AR_PHY_AGC_CONTROL_FLTR_CAL | AR_PHY_AGC_CONTROL_PKDET_CAL; + /* Use chip chainmask only for calibration */ ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask); if (rtt) { @@ -1150,6 +1151,9 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, ar9003_hw_rtt_disable(ah); } + /* Revert chainmask to runtime parameters */ + ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask); + /* Initialize list pointers */ ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;