Fresh pull from upstream
[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 347-ath9k-don-t-run-periodic-and-nf-calibation-at-the-sa.patch
1 From: Felix Fietkau <nbd@nbd.name>
2 Date: Tue, 27 Dec 2016 23:16:23 +0100
3 Subject: [PATCH] ath9k: don't run periodic and nf calibation at the same time
4
5 The checks already prevents periodic cal from being started while noise
6 floor calibration runs. It is missing checks for the other way around.
7
8 Signed-off-by: Felix Fietkau <nbd@nbd.name>
9 ---
10
11 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
12 +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
13 @@ -676,10 +676,10 @@ static int ar9002_hw_calibrate(struct at
14                         return 0;
15  
16                 ah->cal_list_curr = currCal = currCal->calNext;
17 -               if (currCal->calState == CAL_WAITING) {
18 +               if (currCal->calState == CAL_WAITING)
19                         ath9k_hw_reset_calibration(ah, currCal);
20 -                       return 0;
21 -               }
22 +
23 +               return 0;
24         }
25  
26         /* Do NF cal only at longer intervals */