From c864ec11067d1baa75eb6d9044764557d028786b Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 24 Jan 2010 03:26:11 +0100
Subject: [PATCH] --- yaml --- r: 183903 b: refs/heads/master c:
 658965107e2a45a1a4297cb494adc55797dd9ad1 h: refs/heads/master i:   183901:
 579b406e39dc7a893b28d6e9f1835ef3865ad78a   183899:
 4cc0bc31ae76681bd2a6d90c8b07afd8e8728630   183895:
 205ad567dec4b06267134aaa2ee8b265170ab2c5   183887:
 9afe6485325fb3a38b1c81fb6e81d2ff66830ff3   183871:
 879405041ba5cdaffedb5ec361a329b46ad653ec v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/init.c |  3 +--
 trunk/drivers/net/wireless/ath/ath9k/rc.c   | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 7f08f0d5f049..4b90fb7d2e07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff27fabe62d288038b36f41ac6a2190ed7d15993
+refs/heads/master: 658965107e2a45a1a4297cb494adc55797dd9ad1
diff --git a/trunk/drivers/net/wireless/ath/ath9k/init.c b/trunk/drivers/net/wireless/ath/ath9k/init.c
index 5f78d7a5ff22..c3066b553546 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/init.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/init.c
@@ -640,8 +640,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 	hw->max_rates = 4;
 	hw->channel_change_time = 5000;
 	hw->max_listen_interval = 10;
-	/* Hardware supports 10 but we use 4 */
-	hw->max_rate_tries = 4;
+	hw->max_rate_tries = 10;
 	hw->sta_data_size = sizeof(struct ath_node);
 	hw->vif_data_size = sizeof(struct ath_vif);
 
diff --git a/trunk/drivers/net/wireless/ath/ath9k/rc.c b/trunk/drivers/net/wireless/ath/ath9k/rc.c
index c915954d4d5b..74290137f43d 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/rc.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/rc.c
@@ -678,13 +678,13 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
 	 * For Multi Rate Retry we use a different number of
 	 * retry attempt counts. This ends up looking like this:
 	 *
-	 * MRR[0] = 2
-	 * MRR[1] = 2
-	 * MRR[2] = 2
-	 * MRR[3] = 4
+	 * MRR[0] = 4
+	 * MRR[1] = 4
+	 * MRR[2] = 4
+	 * MRR[3] = 8
 	 *
 	 */
-	try_per_rate = sc->hw->max_rate_tries;
+	try_per_rate = 4;
 
 	rate_table = sc->cur_rate_table;
 	rix = ath_rc_get_highest_rix(sc, ath_rc_priv, rate_table, &is_probe);
@@ -714,7 +714,7 @@ static void ath_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta,
 	for ( ; i < 4; i++) {
 		/* Use twice the number of tries for the last MRR segment. */
 		if (i + 1 == 4)
-			try_per_rate = 4;
+			try_per_rate = 8;
 
 		ath_rc_get_lower_rix(rate_table, ath_rc_priv, rix, &nrix);
 		/* All other rates in the series have RTS enabled */