aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath9k/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
-rw-r--r--drivers/net/wireless/ath9k/main.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 699d248efc4c..e26a9a6fbfcf 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -61,12 +61,6 @@ static void bus_read_cachesize(struct ath_softc *sc, int *csz)
61 61
62static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf) 62static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf)
63{ 63{
64 /*
65 * All protection frames are transmited at 2Mb/s for
66 * 11g, otherwise at 1Mb/s.
67 * XXX select protection rate index from rate table.
68 */
69 sc->sc_protrix = 0;
70 switch (conf->channel->band) { 64 switch (conf->channel->band) {
71 case IEEE80211_BAND_2GHZ: 65 case IEEE80211_BAND_2GHZ:
72 if (conf_is_ht20(conf)) 66 if (conf_is_ht20(conf))
@@ -78,11 +72,9 @@ static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf)
78 else if (conf_is_ht40_plus(conf)) 72 else if (conf_is_ht40_plus(conf))
79 sc->cur_rate_table = 73 sc->cur_rate_table =
80 sc->hw_rate_table[ATH9K_MODE_11NG_HT40PLUS]; 74 sc->hw_rate_table[ATH9K_MODE_11NG_HT40PLUS];
81 else { 75 else
82 sc->sc_protrix = 1;
83 sc->cur_rate_table = 76 sc->cur_rate_table =
84 sc->hw_rate_table[ATH9K_MODE_11G]; 77 sc->hw_rate_table[ATH9K_MODE_11G];
85 }
86 break; 78 break;
87 case IEEE80211_BAND_5GHZ: 79 case IEEE80211_BAND_5GHZ:
88 if (conf_is_ht20(conf)) 80 if (conf_is_ht20(conf))
@@ -95,7 +87,8 @@ static void ath_setcurmode(struct ath_softc *sc, struct ieee80211_conf *conf)
95 sc->cur_rate_table = 87 sc->cur_rate_table =
96 sc->hw_rate_table[ATH9K_MODE_11NA_HT40PLUS]; 88 sc->hw_rate_table[ATH9K_MODE_11NA_HT40PLUS];
97 else 89 else
98 sc->cur_rate_table = sc->hw_rate_table[ATH9K_MODE_11A]; 90 sc->cur_rate_table =
91 sc->hw_rate_table[ATH9K_MODE_11A];
99 break; 92 break;
100 default: 93 default:
101 break; 94 break;