ath9k: Use ah_curchan and remove sc_curchan which is redundant

[karo-tx-linux.git] / drivers / net / wireless / ath9k / rc.c

diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index d3132009d94dc5fccced095a1046e33b7d362282..1392361ef9a687b0bb0a03874905acd38f3965a4 100644 (file)
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -484,37 +484,37 @@ static void ar5416_attach_ratetables(struct ath_rate_softc *sc)
        /*
         * Attach rate tables.
         */
-       sc->hw_rate_table[WIRELESS_MODE_11b] = &ar5416_11b_ratetable;
-       sc->hw_rate_table[WIRELESS_MODE_11a] = &ar5416_11a_ratetable;
-       sc->hw_rate_table[WIRELESS_MODE_11g] = &ar5416_11g_ratetable;
+       sc->hw_rate_table[ATH9K_MODE_11B] = &ar5416_11b_ratetable;
+       sc->hw_rate_table[ATH9K_MODE_11A] = &ar5416_11a_ratetable;
+       sc->hw_rate_table[ATH9K_MODE_11G] = &ar5416_11g_ratetable;
 
-       sc->hw_rate_table[WIRELESS_MODE_11NA_HT20] = &ar5416_11na_ratetable;
-       sc->hw_rate_table[WIRELESS_MODE_11NG_HT20] = &ar5416_11ng_ratetable;
-       sc->hw_rate_table[WIRELESS_MODE_11NA_HT40PLUS] =
+       sc->hw_rate_table[ATH9K_MODE_11NA_HT20] = &ar5416_11na_ratetable;
+       sc->hw_rate_table[ATH9K_MODE_11NG_HT20] = &ar5416_11ng_ratetable;
+       sc->hw_rate_table[ATH9K_MODE_11NA_HT40PLUS] =
                &ar5416_11na_ratetable;
-       sc->hw_rate_table[WIRELESS_MODE_11NA_HT40MINUS] =
+       sc->hw_rate_table[ATH9K_MODE_11NA_HT40MINUS] =
                &ar5416_11na_ratetable;
-       sc->hw_rate_table[WIRELESS_MODE_11NG_HT40PLUS] =
+       sc->hw_rate_table[ATH9K_MODE_11NG_HT40PLUS] =
                &ar5416_11ng_ratetable;
-       sc->hw_rate_table[WIRELESS_MODE_11NG_HT40MINUS] =
+       sc->hw_rate_table[ATH9K_MODE_11NG_HT40MINUS] =
                &ar5416_11ng_ratetable;
 }
 
 static void ar5416_setquarter_ratetable(struct ath_rate_softc *sc)
 {
-       sc->hw_rate_table[WIRELESS_MODE_11a] = &ar5416_11a_ratetable_Quarter;
+       sc->hw_rate_table[ATH9K_MODE_11A] = &ar5416_11a_ratetable_Quarter;
        return;
 }
 
 static void ar5416_sethalf_ratetable(struct ath_rate_softc *sc)
 {
-       sc->hw_rate_table[WIRELESS_MODE_11a] = &ar5416_11a_ratetable_Half;
+       sc->hw_rate_table[ATH9K_MODE_11A] = &ar5416_11a_ratetable_Half;
        return;
 }
 
 static void ar5416_setfull_ratetable(struct ath_rate_softc *sc)
 {
-       sc->hw_rate_table[WIRELESS_MODE_11a]   = &ar5416_11a_ratetable;
+       sc->hw_rate_table[ATH9K_MODE_11A] = &ar5416_11a_ratetable;
        return;
 }
 
@@ -847,9 +847,9 @@ void ath_rate_newstate(struct ath_softc *sc, struct ath_vap *avp)
        /* For half and quarter rate channles use different
         * rate tables
         */
-       if (sc->sc_curchan.channelFlags & CHANNEL_HALF)
+       if (sc->sc_ah->ah_curchan->channelFlags & CHANNEL_HALF)
                ar5416_sethalf_ratetable(asc);
-       else if (sc->sc_curchan.channelFlags & CHANNEL_QUARTER)
+       else if (sc->sc_ah->ah_curchan->channelFlags & CHANNEL_QUARTER)
                ar5416_setquarter_ratetable(asc);
        else /* full rate */
                ar5416_setfull_ratetable(asc);
@@ -1123,9 +1123,9 @@ static void ath_rc_ratefind(struct ath_softc *sc,
         * So, set fourth rate in series to be same as third one for
         * above conditions.
         */
-       if ((sc->sc_curmode == WIRELESS_MODE_11NG_HT20) ||
-                       (sc->sc_curmode == WIRELESS_MODE_11NG_HT40PLUS) ||
-                       (sc->sc_curmode == WIRELESS_MODE_11NG_HT40MINUS)) {
+       if ((sc->sc_curmode == ATH9K_MODE_11NG_HT20) ||
+                       (sc->sc_curmode == ATH9K_MODE_11NG_HT40PLUS) ||
+                       (sc->sc_curmode == ATH9K_MODE_11NG_HT40MINUS)) {
                u8  dot11rate = rate_table->info[rix].dot11rate;
                u8 phy = rate_table->info[rix].phy;
                if (i == 4 &&
@@ -1903,7 +1903,7 @@ static void ath_tx_aggr_resp(struct ath_softc *sc,
        int state;
        DECLARE_MAC_BUF(mac);
 
-       if (!sc->sc_txaggr)
+       if (!(sc->sc_flags & SC_OP_TXAGGR))
                return;
 
        txtid = ATH_AN_2_TID(an, tidno);