27 lines
791 B
Diff
27 lines
791 B
Diff
|
From: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Date: Tue, 27 Dec 2016 23:16:23 +0100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- 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 at
|
||
|
|
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 */
|