ath9k: Remove bogus assert in ath_clone_txbuf()
PATCH 1/3 ath9k: Remove bogus assert in ath_clone_txbuf()
oops, this one should be part of the original patch "ath9k: downgrade assert in ath_clone_txbuf()"
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/xmit.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +0 -1
@@ -242,7 +242,6 @@ static struct ath_buf* ath_clone_txbuf(struct ath_softc *sc, struct ath_buf *bf)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);spin_unlock_bh (&sc->tx.txbuflock);
Signature · 1 line
1.5.5.1
PATCH 2/3 ath9k: Handle tx desc shortage more appropriately
Update tx BA window and complete the frame as failed one if we can't clone the holding descriptor due to unavailability of descriptors.
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/xmit.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +16 -1
@@ -382,8 +382,23 @@ 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) +/* +* Update tx baw and complete the frame with +* failed status if we run out of tx buf +*/ +if (!tbf) { +spin_lock_bh (&txq->axq_lock); +ath_tx_update_baw (sc, tid, + bf->bf_seqno); +spin_unlock_bh (&txq->axq_lock); + + bf->bf_state.bf_type |=BUF_XRETRY ; +ath_tx_rc_status (bf, ds, nbad, +0 , false); +ath_tx_complete_buf (sc, bf, &bf_head, +0 ,0 );break ; + }ath9k_hw_cleartxdesc (sc->sc_ah, tbf->bf_desc);list_add_tail (&tbf->list, &bf_head); }else {
Signature · 1 line
1.5.5.1
PATCH 3/3 ath9k: Remove pointless ath9k_ps_restore() in ath_detach()
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath/ath9k/main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +0 -1
@@ -1284,7 +1284,6 @@ void ath_detach(struct ath_softc *sc)ath9k_hw_detach (sc->sc_ah);ath9k_exit_debug (sc); -ath9k_ps_restore (sc); } static int ath9k_reg_notifier(struct wiphy *wiphy,
Signature · 1 line
1.5.5.1