From 1b3f860ed9a5c74dca0cbbcd7d343b4f050110e0 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Wed, 24 Jun 2009 18:58:47 +0530
Subject: [PATCH] --- yaml --- r: 155127 b: refs/heads/master c:
 cbfe89c67b58e2bd1b47f6986b3b793f06f3d9b0 h: refs/heads/master i:   155125:
 02d94f7bbc1b1e5f583608df440a67966b1cf8af   155123:
 56ea115209c0f71bc3821b842064bc7a07cc7c35   155119:
 963c74685592143935d66b73e7ecb434095c9763 v: v3

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

diff --git a/[refs] b/[refs]
index cdb0e1c5bb07..648e8c5dda25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd4973c56f8d9baac8d269791a90e5119ce30a0e
+refs/heads/master: cbfe89c67b58e2bd1b47f6986b3b793f06f3d9b0
diff --git a/trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
index b61a071788a5..4ccf48e396df 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
@@ -355,7 +355,14 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 		}
 
 		if (bf_next == NULL) {
-			INIT_LIST_HEAD(&bf_head);
+			/*
+			 * Make sure the last desc is reclaimed if it
+			 * not a holding desc.
+			 */
+			if (!bf_last->bf_stale)
+				list_move_tail(&bf->list, &bf_head);
+			else
+				INIT_LIST_HEAD(&bf_head);
 		} else {
 			ASSERT(!list_empty(bf_q));
 			list_move_tail(&bf->list, &bf_head);