aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-07-14 20:14:02 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:15 -0400
commitdfe80a3fd2199c31d0a2dc24044abaadb64c26c2 (patch)
treeb1ec4846c147c12a1baa830bd7ab036493407678
parent4e6df85dacedbc68b551fdd8677f7df68639c181 (diff)
ath9k: remove ATH9K_MODE_11B
This saves us 2733 bytes. text data bss dec hex filename 252265 3628 1584 257477 3edc5 ath9k-has-b-rate.ko 249905 3628 1584 255117 3e48d ath9k.ko Cc: Derek Smithies <derek@indranet.co.nz> Cc: Chittajit Mitra <Chittajit.Mitra@Atheros.com> Siged-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c1
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h1
-rw-r--r--drivers/net/wireless/ath/ath9k/rc.c23
3 files changed, 0 insertions, 25 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index cffb0789f669..a115c8ceabe3 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -3305,7 +3305,6 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
3305 } 3305 }
3306 3306
3307 if (eeval & AR5416_OPFLAGS_11G) { 3307 if (eeval & AR5416_OPFLAGS_11G) {
3308 set_bit(ATH9K_MODE_11B, pCap->wireless_modes);
3309 set_bit(ATH9K_MODE_11G, pCap->wireless_modes); 3308 set_bit(ATH9K_MODE_11G, pCap->wireless_modes);
3310 if (ah->config.ht_enable) { 3309 if (ah->config.ht_enable) {
3311 if (!(eeval & AR5416_OPFLAGS_N_2G_HT20)) 3310 if (!(eeval & AR5416_OPFLAGS_N_2G_HT20))
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 9d0b31ad4603..5e40223259c8 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -113,7 +113,6 @@
113 113
114enum wireless_mode { 114enum wireless_mode {
115 ATH9K_MODE_11A = 0, 115 ATH9K_MODE_11A = 0,
116 ATH9K_MODE_11B = 2,
117 ATH9K_MODE_11G = 3, 116 ATH9K_MODE_11G = 3,
118 ATH9K_MODE_11NA_HT20 = 6, 117 ATH9K_MODE_11NA_HT20 = 6,
119 ATH9K_MODE_11NG_HT20 = 7, 118 ATH9K_MODE_11NG_HT20 = 7,
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index b0e3702ca06a..112a0ec0df4f 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -380,27 +380,6 @@ static const struct ath_rate_table ar5416_11g_ratetable = {
380 0, /* Phy rates allowed initially */ 380 0, /* Phy rates allowed initially */
381}; 381};
382 382
383static const struct ath_rate_table ar5416_11b_ratetable = {
384 4,
385 {
386 { VALID, VALID, WLAN_RC_PHY_CCK, 1000, /* 1 Mb */
387 900, 0x1b, 0x00, (0x80|2),
388 0, 0, 1, 0, 0 },
389 { VALID, VALID, WLAN_RC_PHY_CCK, 2000, /* 2 Mb */
390 1800, 0x1a, 0x04, (0x80|4),
391 1, 1, 1, 1, 0 },
392 { VALID, VALID, WLAN_RC_PHY_CCK, 5500, /* 5.5 Mb */
393 4300, 0x19, 0x04, (0x80|11),
394 1, 2, 2, 2, 0 },
395 { VALID, VALID, WLAN_RC_PHY_CCK, 11000, /* 11 Mb */
396 7100, 0x18, 0x04, (0x80|22),
397 1, 4, 100, 3, 0 },
398 },
399 100, /* probe interval */
400 100, /* rssi reduce interval */
401 0, /* Phy rates allowed initially */
402};
403
404static inline int8_t median(int8_t a, int8_t b, int8_t c) 383static inline int8_t median(int8_t a, int8_t b, int8_t c)
405{ 384{
406 if (a >= b) { 385 if (a >= b) {
@@ -1702,8 +1681,6 @@ static struct rate_control_ops ath_rate_ops = {
1702 1681
1703void ath_rate_attach(struct ath_softc *sc) 1682void ath_rate_attach(struct ath_softc *sc)
1704{ 1683{
1705 sc->hw_rate_table[ATH9K_MODE_11B] =
1706 &ar5416_11b_ratetable;
1707 sc->hw_rate_table[ATH9K_MODE_11A] = 1684 sc->hw_rate_table[ATH9K_MODE_11A] =
1708 &ar5416_11a_ratetable; 1685 &ar5416_11a_ratetable;
1709 sc->hw_rate_table[ATH9K_MODE_11G] = 1686 sc->hw_rate_table[ATH9K_MODE_11G] =