From 0530ee7c5c9185009d192beffd6d3de7f3d5a65c Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Wed, 25 Feb 2009 10:28:23 +0530
Subject: [PATCH] --- yaml --- r: 135062 b: refs/heads/master c:
 fa09632b0277aa43c6f37161f0a592a1a5b2167d h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/wireless/ath9k/rc.c | 27 ---------------------------
 trunk/drivers/net/wireless/ath9k/rc.h |  2 --
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 3285ecc7abaf..39b1c4cd4267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f40154e7f7be1c58e8041ed4fbe6cd3b8049f4b4
+refs/heads/master: fa09632b0277aa43c6f37161f0a592a1a5b2167d
diff --git a/trunk/drivers/net/wireless/ath9k/rc.c b/trunk/drivers/net/wireless/ath9k/rc.c
index cf0559f183af..18d19c394475 100644
--- a/trunk/drivers/net/wireless/ath9k/rc.c
+++ b/trunk/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/trunk/drivers/net/wireless/ath9k/rc.h b/trunk/drivers/net/wireless/ath9k/rc.h
index d688ec51a14f..a6dc82d92612 100644
--- a/trunk/drivers/net/wireless/ath9k/rc.h
+++ b/trunk/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;