diff options
| author | Felix Fietkau | 2018-07-30 20:31:17 +0200 |
|---|---|---|
| committer | Kalle Valo | 2018-07-31 09:51:43 +0200 |
| commit | 3a69dd366866b066b329f6074189a1a6eb056b93 (patch) | |
| tree | 2057a4c6bbdd0deebe939bd67e64c44c7423975d /drivers/net/wireless | |
| parent | ath9k_hw: set spectral scan enable bit on trigger for AR9003+ (diff) | |
| download | kernel-qcow2-linux-3a69dd366866b066b329f6074189a1a6eb056b93.tar.gz kernel-qcow2-linux-3a69dd366866b066b329f6074189a1a6eb056b93.tar.xz kernel-qcow2-linux-3a69dd366866b066b329f6074189a1a6eb056b93.zip | |
ath9k: don't run periodic and nf calibation at the same time
The checks already prevents periodic cal from being started while noise
floor calibration runs. It is missing checks for the other way around.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9002_calib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_calib.c b/drivers/net/wireless/ath/ath9k/ar9002_calib.c index 50fcd343c41a..fd9db8ca99d7 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c @@ -676,10 +676,10 @@ static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan, return 0; ah->cal_list_curr = currCal = currCal->calNext; - if (currCal->calState == CAL_WAITING) { + if (currCal->calState == CAL_WAITING) ath9k_hw_reset_calibration(ah, currCal); - return 0; - } + + return 0; } /* Do NF cal only at longer intervals */ |