package/kernel/mac80211/patches/566-ath9k_nfcal_xor_percal.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
   2 +++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
   3 @@ -660,7 +660,6 @@ static void ar9002_hw_olc_temp_compensat
   4  static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
   5                                u8 rxchainmask, bool longcal)
   6  {
   7 -       bool iscaldone = true;
   8         struct ath9k_cal_list *currCal = ah->cal_list_curr;
   9         bool nfcal, nfcal_pending = false;
  10         int ret;
  11 @@ -672,15 +671,13 @@ static int ar9002_hw_calibrate(struct at
  12         if (currCal && !nfcal &&
  13             (currCal->calState == CAL_RUNNING ||
  14              currCal->calState == CAL_WAITING)) {
  15 -               iscaldone = ar9002_hw_per_calibration(ah, chan,
  16 -                                                     rxchainmask, currCal);
  17 -               if (iscaldone) {
  18 -                       ah->cal_list_curr = currCal = currCal->calNext;
  19 -
  20 -                       if (currCal->calState == CAL_WAITING) {
  21 -                               iscaldone = false;
  22 -                               ath9k_hw_reset_calibration(ah, currCal);
  23 -                       }
  24 +               if (!ar9002_hw_per_calibration(ah, chan, rxchainmask, currCal))
  25 +                       return 0;
  26 +
  27 +               ah->cal_list_curr = currCal = currCal->calNext;
  28 +               if (currCal->calState == CAL_WAITING) {
  29 +                       ath9k_hw_reset_calibration(ah, currCal);
  30 +                       return 0;
  31                 }
  32         }
  33
  34 @@ -710,7 +707,7 @@ static int ar9002_hw_calibrate(struct at
  35                 }
  36         }
  37
  38 -       return iscaldone;
  39 +       return 1;
  40  }
  41
  42  /* Carrier leakage Calibration fix */