aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath9k/main.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-12-23 18:58:39 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:29 -0500
commitce111badf5ac387e9eefe1f2bba751f595994cb2 (patch)
tree4f541d2b8e0b599bad37d62fb2e49f57b4e065a3 /drivers/net/wireless/ath9k/main.c
parent96742256aba8c458d49af42610557977245be82d (diff)
ath9k: Rename ath_setcurmode() to ath_cache_conf_rate()
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>
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath9k/main.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index e26a9a6fbfcf..0087a907aac4 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -59,7 +59,8 @@ static void bus_read_cachesize(struct ath_softc *sc, int *csz)
59 *csz = DEFAULT_CACHELINE >> 2; /* Use the default size */ 59 *csz = DEFAULT_CACHELINE >> 2; /* Use the default size */
60} 60}
61 61
62static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf) 62static void ath_cache_conf_rate(struct ath_softc *sc,
63 struct ieee80211_conf *conf)
63{ 64{
64 switch (conf->channel->band) { 65 switch (conf->channel->band) {
65 case IEEE80211_BAND_2GHZ: 66 case IEEE80211_BAND_2GHZ:
@@ -91,6 +92,7 @@ static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf)
91 sc->hw_rate_table[ATH9K_MODE_11A]; 92 sc->hw_rate_table[ATH9K_MODE_11A];
92 break; 93 break;
93 default: 94 default:
95 BUG_ON(1);
94 break; 96 break;
95 } 97 }
96} 98}
@@ -316,7 +318,7 @@ static int ath_set_channel(struct ath_softc *sc, struct ath9k_channel *hchan)
316 return -EIO; 318 return -EIO;
317 } 319 }
318 320
319 ath_setcurmode(sc, &hw->conf); 321 ath_cache_conf_rate(sc, &hw->conf);
320 ath_update_txpow(sc); 322 ath_update_txpow(sc);
321 ath9k_hw_set_interrupts(ah, sc->sc_imask); 323 ath9k_hw_set_interrupts(ah, sc->sc_imask);
322 } 324 }
@@ -1647,7 +1649,7 @@ int ath_reset(struct ath_softc *sc, bool retry_tx)
1647 * that changes the channel so update any state that 1649 * that changes the channel so update any state that
1648 * might change as a result. 1650 * might change as a result.
1649 */ 1651 */
1650 ath_setcurmode(sc, &hw->conf); 1652 ath_cache_conf_rate(sc, &hw->conf);
1651 1653
1652 ath_update_txpow(sc); 1654 ath_update_txpow(sc);
1653 1655
@@ -1944,7 +1946,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
1944 !sc->sc_config.swBeaconProcess) 1946 !sc->sc_config.swBeaconProcess)
1945 sc->sc_imask |= ATH9K_INT_TIM; 1947 sc->sc_imask |= ATH9K_INT_TIM;
1946 1948
1947 ath_setcurmode(sc, &hw->conf); 1949 ath_cache_conf_rate(sc, &hw->conf);
1948 1950
1949 sc->sc_flags &= ~SC_OP_INVALID; 1951 sc->sc_flags &= ~SC_OP_INVALID;
1950 1952