Commit e1566d1f authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville

ath9k: fix recursive locking in the tx flush path

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Tested-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b5bb2f2b
...@@ -163,6 +163,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid) ...@@ -163,6 +163,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
bf = list_first_entry(&tid->buf_q, struct ath_buf, list); bf = list_first_entry(&tid->buf_q, struct ath_buf, list);
list_move_tail(&bf->list, &bf_head); list_move_tail(&bf->list, &bf_head);
spin_unlock_bh(&txq->axq_lock);
fi = get_frame_info(bf->bf_mpdu); fi = get_frame_info(bf->bf_mpdu);
if (fi->retries) { if (fi->retries) {
ath_tx_update_baw(sc, tid, fi->seqno); ath_tx_update_baw(sc, tid, fi->seqno);
...@@ -170,6 +171,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid) ...@@ -170,6 +171,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
} else { } else {
ath_tx_send_normal(sc, txq, tid, &bf_head); ath_tx_send_normal(sc, txq, tid, &bf_head);
} }
spin_lock_bh(&txq->axq_lock);
} }
spin_unlock_bh(&txq->axq_lock); spin_unlock_bh(&txq->axq_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment