diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index f84477c5ebb..abe05ec85d5 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1702,10 +1702,10 @@ static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan) | |||
1702 | * For AR9462, make sure that calibration data for | 1702 | * For AR9462, make sure that calibration data for |
1703 | * re-using are present. | 1703 | * re-using are present. |
1704 | */ | 1704 | */ |
1705 | if (AR_SREV_9462(ah) && (!ah->caldata || | 1705 | if (AR_SREV_9462(ah) && (ah->caldata && |
1706 | !ah->caldata->done_txiqcal_once || | 1706 | (!ah->caldata->done_txiqcal_once || |
1707 | !ah->caldata->done_txclcal_once || | 1707 | !ah->caldata->done_txclcal_once || |
1708 | !ah->caldata->rtt_hist.num_readings)) | 1708 | !ah->caldata->rtt_done))) |
1709 | goto fail; | 1709 | goto fail; |
1710 | 1710 | ||
1711 | ath_dbg(common, RESET, "FastChannelChange for %d -> %d\n", | 1711 | ath_dbg(common, RESET, "FastChannelChange for %d -> %d\n", |
@@ -1941,7 +1941,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, | |||
1941 | if (caldata) { | 1941 | if (caldata) { |
1942 | caldata->done_txiqcal_once = false; | 1942 | caldata->done_txiqcal_once = false; |
1943 | caldata->done_txclcal_once = false; | 1943 | caldata->done_txclcal_once = false; |
1944 | caldata->rtt_hist.num_readings = 0; | ||
1945 | } | 1944 | } |
1946 | if (!ath9k_hw_init_cal(ah, chan)) | 1945 | if (!ath9k_hw_init_cal(ah, chan)) |
1947 | return -EIO; | 1946 | return -EIO; |