diff options
author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2009-02-24 23:58:23 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-03-05 14:39:31 -0500 |
commit | fa09632b0277aa43c6f37161f0a592a1a5b2167d (patch) | |
tree | a35ad78160e14308b4c96dad38308c2ee8448f24 | |
parent | f40154e7f7be1c58e8041ed4fbe6cd3b8049f4b4 (diff) |
ath9k: Remove ununsed ack duration stuff with long/short preamble
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath9k/rc.c | 27 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/rc.h | 2 |
2 files changed, 0 insertions, 29 deletions
diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c index cf0559f183af..18d19c394475 100644 --- a/drivers/net/wireless/ath9k/rc.c +++ b/drivers/net/wireless/ath9k/rc.c | |||
@@ -1656,27 +1656,6 @@ static struct rate_control_ops ath_rate_ops = { | |||
1656 | .free_sta = ath_rate_free_sta, | 1656 | .free_sta = ath_rate_free_sta, |
1657 | }; | 1657 | }; |
1658 | 1658 | ||
1659 | static void ath_setup_rate_table(struct ath_softc *sc, | ||
1660 | struct ath_rate_table *rate_table) | ||
1661 | { | ||
1662 | int i; | ||
1663 | |||
1664 | for (i = 0; i < rate_table->rate_cnt; i++) { | ||
1665 | u8 cix = rate_table->info[i].ctrl_rate; | ||
1666 | |||
1667 | rate_table->info[i].lpAckDuration = | ||
1668 | ath9k_hw_computetxtime(sc->sc_ah, rate_table, | ||
1669 | WLAN_CTRL_FRAME_SIZE, | ||
1670 | cix, | ||
1671 | false); | ||
1672 | rate_table->info[i].spAckDuration = | ||
1673 | ath9k_hw_computetxtime(sc->sc_ah, rate_table, | ||
1674 | WLAN_CTRL_FRAME_SIZE, | ||
1675 | cix, | ||
1676 | true); | ||
1677 | } | ||
1678 | } | ||
1679 | |||
1680 | void ath_rate_attach(struct ath_softc *sc) | 1659 | void ath_rate_attach(struct ath_softc *sc) |
1681 | { | 1660 | { |
1682 | sc->hw_rate_table[ATH9K_MODE_11B] = | 1661 | sc->hw_rate_table[ATH9K_MODE_11B] = |
@@ -1697,12 +1676,6 @@ void ath_rate_attach(struct ath_softc *sc) | |||
1697 | &ar5416_11ng_ratetable; | 1676 | &ar5416_11ng_ratetable; |
1698 | sc->hw_rate_table[ATH9K_MODE_11NG_HT40MINUS] = | 1677 | sc->hw_rate_table[ATH9K_MODE_11NG_HT40MINUS] = |
1699 | &ar5416_11ng_ratetable; | 1678 | &ar5416_11ng_ratetable; |
1700 | |||
1701 | ath_setup_rate_table(sc, &ar5416_11b_ratetable); | ||
1702 | ath_setup_rate_table(sc, &ar5416_11a_ratetable); | ||
1703 | ath_setup_rate_table(sc, &ar5416_11g_ratetable); | ||
1704 | ath_setup_rate_table(sc, &ar5416_11na_ratetable); | ||
1705 | ath_setup_rate_table(sc, &ar5416_11ng_ratetable); | ||
1706 | } | 1679 | } |
1707 | 1680 | ||
1708 | int ath_rate_control_register(void) | 1681 | int ath_rate_control_register(void) |
diff --git a/drivers/net/wireless/ath9k/rc.h b/drivers/net/wireless/ath9k/rc.h index d688ec51a14f..a6dc82d92612 100644 --- a/drivers/net/wireless/ath9k/rc.h +++ b/drivers/net/wireless/ath9k/rc.h | |||
@@ -120,8 +120,6 @@ struct ath_rate_table { | |||
120 | u8 sgi_index; | 120 | u8 sgi_index; |
121 | u8 ht_index; | 121 | u8 ht_index; |
122 | u32 max_4ms_framelen; | 122 | u32 max_4ms_framelen; |
123 | u16 lpAckDuration; | ||
124 | u16 spAckDuration; | ||
125 | } info[RATE_TABLE_SIZE]; | 123 | } info[RATE_TABLE_SIZE]; |
126 | u32 probe_interval; | 124 | u32 probe_interval; |
127 | u32 rssi_reduce_interval; | 125 | u32 rssi_reduce_interval; |