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>

diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index cf0559f183af6d4215be80e33b4ae986d6711640..18d19c3944756d7ec92b3e492021fcdeb411e510 100644 (file)
--- 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 = {
        .free_sta = ath_rate_free_sta,
 };
 
-static void ath_setup_rate_table(struct ath_softc *sc,
-                                struct ath_rate_table *rate_table)
-{
-       int i;
-
-       for (i = 0; i < rate_table->rate_cnt; i++) {
-               u8 cix = rate_table->info[i].ctrl_rate;
-
-               rate_table->info[i].lpAckDuration =
-                       ath9k_hw_computetxtime(sc->sc_ah, rate_table,
-                                              WLAN_CTRL_FRAME_SIZE,
-                                              cix,
-                                              false);
-               rate_table->info[i].spAckDuration =
-                       ath9k_hw_computetxtime(sc->sc_ah, rate_table,
-                                              WLAN_CTRL_FRAME_SIZE,
-                                              cix,
-                                              true);
-       }
-}
-
 void ath_rate_attach(struct ath_softc *sc)
 {
        sc->hw_rate_table[ATH9K_MODE_11B] =
@@ -1697,12 +1676,6 @@ void ath_rate_attach(struct ath_softc *sc)
                &ar5416_11ng_ratetable;
        sc->hw_rate_table[ATH9K_MODE_11NG_HT40MINUS] =
                &ar5416_11ng_ratetable;
-
-       ath_setup_rate_table(sc, &ar5416_11b_ratetable);
-       ath_setup_rate_table(sc, &ar5416_11a_ratetable);
-       ath_setup_rate_table(sc, &ar5416_11g_ratetable);
-       ath_setup_rate_table(sc, &ar5416_11na_ratetable);
-       ath_setup_rate_table(sc, &ar5416_11ng_ratetable);
 }
 
 int ath_rate_control_register(void)

diff --git a/drivers/net/wireless/ath9k/rc.h b/drivers/net/wireless/ath9k/rc.h
index d688ec51a14fa8cca27b4266290aa58489c69d4b..a6dc82d92612e304d1788e5f66dde993ab887328 100644 (file)
--- a/drivers/net/wireless/ath9k/rc.h
+++ b/drivers/net/wireless/ath9k/rc.h
@@ -120,8 +120,6 @@ struct ath_rate_table {
                u8 sgi_index;
                u8 ht_index;
                u32 max_4ms_framelen;
-               u16 lpAckDuration;
-               u16 spAckDuration;
        } info[RATE_TABLE_SIZE];
        u32 probe_interval;
        u32 rssi_reduce_interval;