ath9k: Rename ath_setcurmode() to ath_cache_conf_rate()
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Tue, 23 Dec 2008 23:58:39 +0000 (15:58 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jan 2009 20:59:29 +0000 (15:59 -0500)
ath_setcurmode() is a bit misleading, all we are doing is
caching the rate for the corresponding configuration we
are using.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath9k/main.c

index e26a9a6fbfcf1ae7656379eb2039da607623659b..0087a907aac46e14f808a5a992e6244788d23d3e 100644 (file)
@@ -59,7 +59,8 @@ static void bus_read_cachesize(struct ath_softc *sc, int *csz)
                *csz = DEFAULT_CACHELINE >> 2;   /* Use the default size */
 }
 
-static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf)
+static void ath_cache_conf_rate(struct ath_softc *sc,
+                               struct ieee80211_conf *conf)
 {
        switch (conf->channel->band) {
        case IEEE80211_BAND_2GHZ:
@@ -91,6 +92,7 @@ static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf)
                          sc->hw_rate_table[ATH9K_MODE_11A];
                break;
        default:
+               BUG_ON(1);
                break;
        }
 }
@@ -316,7 +318,7 @@ static int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan)
                        return -EIO;
                }
 
-               ath_setcurmode(sc, &hw->conf);
+               ath_cache_conf_rate(sc, &hw->conf);
                ath_update_txpow(sc);
                ath9k_hw_set_interrupts(ah, sc->sc_imask);
        }
@@ -1647,7 +1649,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
         * that changes the channel so update any state that
         * might change as a result.
         */
-       ath_setcurmode(sc, &hw->conf);
+       ath_cache_conf_rate(sc, &hw->conf);
 
        ath_update_txpow(sc);
 
@@ -1944,7 +1946,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
            !sc->sc_config.swBeaconProcess)
                sc->sc_imask |= ATH9K_INT_TIM;
 
-       ath_setcurmode(sc, &hw->conf);
+       ath_cache_conf_rate(sc, &hw->conf);
 
        sc->sc_flags &= ~SC_OP_INVALID;