From 29217d736a806016e7139a79ed3b7333cbeca832 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Thu, 9 Feb 2012 21:08:58 +0100
Subject: [PATCH] --- yaml --- r: 290614 b: refs/heads/master c:
 5e379203c7788b7af01150bfadbc74d2797a2ef4 h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4e6a56bdb89c..5bb25bab7a57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01343537e6da3398ecea205ff1d579e4dc226b93
+refs/heads/master: 5e379203c7788b7af01150bfadbc74d2797a2ef4
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index d89dcb14cb6d..c1ce831b9bf4 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -1051,17 +1051,13 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
 		}
 		/* either retransmit or send bar if ack not recd */
 		if (!ack_recd) {
-			struct ieee80211_tx_rate *txrate =
-			    tx_info->status.rates;
-			if (retry && (txrate[0].count < (int)retry_limit)) {
+			if (retry && (ini->txretry[index] < (int)retry_limit)) {
 				ini->txretry[index]++;
 				ini->tx_in_transit--;
 				/*
 				 * Use high prededence for retransmit to
 				 * give some punch
 				 */
-				/* brcms_c_txq_enq(wlc, scb, p,
-				 * BRCMS_PRIO_TO_PREC(tid)); */
 				brcms_c_txq_enq(wlc, scb, p,
 						BRCMS_PRIO_TO_HI_PREC(tid));
 			} else {