From 48bb42b30cb4df643cb9fa42847d759a968cd4d1 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Wed, 10 Jun 2009 17:50:09 +0530
Subject: [PATCH] --- yaml --- r: 158783 b: refs/heads/master c:
 8a46097a6c60dc9d2f09bf01734f3308142614b3 h: refs/heads/master i:   158781:
 4f61be780e4e79a1d5f0894e2c100950d0a80f30   158779:
 634f62c255d6ab8bf00b205c539b45a087ba6255   158775:
 340f562e816884290c2c300d86a6badcb2ed4588   158767:
 f1c7946b5145469e51cb63f5c83a3d6ed41d787c   158751:
 95f07acad322f980496de00aca3f127064c9d4a4   158719:
 1301b2df38f94690a4123a7fa388df051aa8d193 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/xmit.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf20b990b490..054f12d54f1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3d8f02ed9699252d69a9a14276980d9df7c5fe1
+refs/heads/master: 8a46097a6c60dc9d2f09bf01734f3308142614b3
diff --git a/trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
index e08c8174d656..5de9878d2c12 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
@@ -238,6 +238,10 @@ static struct ath_buf* ath_clone_txbuf(struct ath_softc *sc, struct ath_buf *bf)
 	struct ath_buf *tbf;
 
 	spin_lock_bh(&sc->tx.txbuflock);
+	if (WARN_ON(list_empty(&sc->tx.txbuf))) {
+		spin_unlock_bh(&sc->tx.txbuflock);
+		return NULL;
+	}
 	ASSERT(!list_empty((&sc->tx.txbuf)));
 	tbf = list_first_entry(&sc->tx.txbuf, struct ath_buf, list);
 	list_del(&tbf->list);
@@ -379,6 +383,8 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
 				struct ath_buf *tbf;
 
 				tbf = ath_clone_txbuf(sc, bf_last);
+				if (!tbf)
+					break;
 				ath9k_hw_cleartxdesc(sc->sc_ah, tbf->bf_desc);
 				list_add_tail(&tbf->list, &bf_head);
 			} else {