3 files changed, 27 insertions, 42 deletions

diff --git a/drivers/net/wireless/ath9k/ath9k.h b/drivers/net/wireless/ath9k/ath9k.h
index 78fffdf9339f..adcd34249a8b 100644
--- a/drivers/net/wireless/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath9k/ath9k.h
@@ -949,8 +949,7 @@ void ath9k_hw_ani_detach(struct ath_hal *ah);
 
 /* Calibration */
 
-void ath9k_hw_reset_calvalid(struct ath_hal *ah, struct ath9k_channel *chan,
-                             bool *isCalDone);
+bool ath9k_hw_reset_calvalid(struct ath_hal *ah);
 void ath9k_hw_start_nfcal(struct ath_hal *ah);
 void ath9k_hw_loadnf(struct ath_hal *ah, struct ath9k_channel *chan);
 int16_t ath9k_hw_getnf(struct ath_hal *ah,
diff --git a/drivers/net/wireless/ath9k/calib.c b/drivers/net/wireless/ath9k/calib.c
index 2a6b8a4d6e9e..707289685b41 100644
--- a/drivers/net/wireless/ath9k/calib.c
+++ b/drivers/net/wireless/ath9k/calib.c
@@ -277,27 +277,24 @@ static void ath9k_hw_per_calibration(struct ath_hal *ah,
         }
 }
 
+/* Assumes you are talking about the currently configured channel */
 static bool ath9k_hw_iscal_supported(struct ath_hal *ah,
-                                     struct ath9k_channel *chan,
                                      enum hal_cal_types calType)
 {
         struct ath_hal_5416 *ahp = AH5416(ah);
-        bool retval = false;
+        struct ieee80211_conf *conf = &ah->ah_sc->hw->conf;
 
         switch (calType & ahp->ah_suppCals) {
-        case IQ_MISMATCH_CAL:
-                if (!IS_CHAN_B(chan))
-                        retval = true;
-                break;
+        case IQ_MISMATCH_CAL: /* Both 2 GHz and 5 GHz support OFDM */
+                return true;
         case ADC_GAIN_CAL:
         case ADC_DC_CAL:
-                if (!IS_CHAN_B(chan)
-                    && !(IS_CHAN_2GHZ(chan) && IS_CHAN_HT20(chan)))
-                        retval = true;
+                if (conf->channel->band == IEEE80211_BAND_5GHZ &&
+                  conf_is_ht20(conf))
+                        return true;
                 break;
         }
-
-        return retval;
+        return false;
 }
 
 static void ath9k_hw_iqcal_collect(struct ath_hal *ah)
@@ -565,50 +562,40 @@ static void ath9k_hw_adc_dccal_calibrate(struct ath_hal *ah, u8 numChains)
                   AR_PHY_NEW_ADC_DC_OFFSET_CORR_ENABLE);
 }
 
-void ath9k_hw_reset_calvalid(struct ath_hal *ah, struct ath9k_channel *chan,
-                             bool *isCalDone)
+/* This is done for the currently configured channel */
+bool ath9k_hw_reset_calvalid(struct ath_hal *ah)
 {
         struct ath_hal_5416 *ahp = AH5416(ah);
-        struct ath9k_channel *ichan =
-                ath9k_regd_check_channel(ah, chan);
+        struct ieee80211_conf *conf = &ah->ah_sc->hw->conf;
         struct hal_cal_list *currCal = ahp->ah_cal_list_curr;
 
-        *isCalDone = true;
+        if (!ah->ah_curchan)
+                return true;
 
         if (!AR_SREV_9100(ah) && !AR_SREV_9160_10_OR_LATER(ah))
-                return;
+                return true;
 
         if (currCal == NULL)
-                return;
-
-        if (ichan == NULL) {
-                DPRINTF(ah->ah_sc, ATH_DBG_CALIBRATE,
-                        "invalid channel %u/0x%x; no mapping\n",
-                        chan->channel, chan->channelFlags);
-                return;
-        }
-
+                return true;
 
         if (currCal->calState != CAL_DONE) {
                 DPRINTF(ah->ah_sc, ATH_DBG_CALIBRATE,
                         "Calibration state incorrect, %d\n",
                         currCal->calState);
-                return;
+                return true;
         }
 
-
-        if (!ath9k_hw_iscal_supported(ah, chan, currCal->calData->calType))
-                return;
+        if (!ath9k_hw_iscal_supported(ah, currCal->calData->calType))
+                return true;
 
         DPRINTF(ah->ah_sc, ATH_DBG_CALIBRATE,
-                "Resetting Cal %d state for channel %u/0x%x\n",
-                currCal->calData->calType, chan->channel,
-                chan->channelFlags);
+                "Resetting Cal %d state for channel %u\n",
+                currCal->calData->calType, conf->channel->center_freq);
 
-        ichan->CalValid &= ~currCal->calData->calType;
+        ah->ah_curchan->CalValid &= ~currCal->calData->calType;
         currCal->calState = CAL_WAITING;
 
-        *isCalDone = false;
+        return false;
 }
 
 void ath9k_hw_start_nfcal(struct ath_hal *ah)
@@ -933,19 +920,19 @@ bool ath9k_hw_init_cal(struct ath_hal *ah,
         ahp->ah_cal_list = ahp->ah_cal_list_last = ahp->ah_cal_list_curr = NULL;
 
         if (AR_SREV_9100(ah) || AR_SREV_9160_10_OR_LATER(ah)) {
-                if (ath9k_hw_iscal_supported(ah, chan, ADC_GAIN_CAL)) {
+                if (ath9k_hw_iscal_supported(ah, ADC_GAIN_CAL)) {
                         INIT_CAL(&ahp->ah_adcGainCalData);
                         INSERT_CAL(ahp, &ahp->ah_adcGainCalData);
                         DPRINTF(ah->ah_sc, ATH_DBG_CALIBRATE,
                                 "enabling ADC Gain Calibration.\n");
                 }
-                if (ath9k_hw_iscal_supported(ah, chan, ADC_DC_CAL)) {
+                if (ath9k_hw_iscal_supported(ah, ADC_DC_CAL)) {
                         INIT_CAL(&ahp->ah_adcDcCalData);
                         INSERT_CAL(ahp, &ahp->ah_adcDcCalData);
                         DPRINTF(ah->ah_sc, ATH_DBG_CALIBRATE,
                                 "enabling ADC DC Calibration.\n");
                 }
-                if (ath9k_hw_iscal_supported(ah, chan, IQ_MISMATCH_CAL)) {
+                if (ath9k_hw_iscal_supported(ah, IQ_MISMATCH_CAL)) {
                         INIT_CAL(&ahp->ah_iqCalData);
                         INSERT_CAL(ahp, &ahp->ah_iqCalData);
                         DPRINTF(ah->ah_sc, ATH_DBG_CALIBRATE,
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 12c5b9a44904..7d9a263ea0a7 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -372,8 +372,7 @@ static void ath_ani_calibrate(unsigned long data)
         } else {
                 if ((timestamp - sc->sc_ani.sc_resetcal_timer) >=
                     ATH_RESTART_CALINTERVAL) {
-                        ath9k_hw_reset_calvalid(ah, ah->ah_curchan,
-                                                &sc->sc_ani.sc_caldone);
+                        sc->sc_ani.sc_caldone = ath9k_hw_reset_calvalid(ah);
                         if (sc->sc_ani.sc_caldone)
                                 sc->sc_ani.sc_resetcal_timer = timestamp;
                 }