---

yaml
---
r: 158783
b: refs/heads/master
c: 8a46097
h: refs/heads/master
i:
  158781: 4f61be7
  158779: 634f62c
  158775: 340f562
  158767: f1c7946
  158751: 95f07ac
  158719: 1301b2d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3d8f02ed9699252d69a9a14276980d9df7c5fe1
+refs/heads/master: 8a46097a6c60dc9d2f09bf01734f3308142614b3

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 {