---

yaml --- r: 155127 b: refs/heads/master c: cbfe89c h: refs/heads/master i: 155125: 02d94f7 155123: 56ea115 155119: 963c746 v: v3
git-mirror · Jul 7, 2009 · 1b3f860 · 1b3f860
1 parent 51226b4
commit 1b3f860
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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);