diff options
| author | Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2009-06-10 17:50:09 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-10 14:57:39 -0400 |
| commit | 8a46097a6c60dc9d2f09bf01734f3308142614b3 (patch) | |
| tree | 74d660b3059a2285a7334d36b75329c552f80f34 | |
| parent | c3d8f02ed9699252d69a9a14276980d9df7c5fe1 (diff) | |
| download | linux-8a46097a6c60dc9d2f09bf01734f3308142614b3.tar.gz linux-8a46097a6c60dc9d2f09bf01734f3308142614b3.tar.bz2 linux-8a46097a6c60dc9d2f09bf01734f3308142614b3.zip | |
ath9k: downgrade ASSERT() in ath_clone_txbuf()
We can easily run out of tx buf if there is any stuck in
transmission, so downgrade it to WARN_ON().
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index e08c8174d656..5de9878d2c12 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/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 { |