ath9k: fix recursive locking in the tx flush path

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Tested-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index c63e283ff97f2154ee41bcbb5084c21a3e86f020..495432ec85a99d65cfc710737bbbf6fdb7878281 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -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);
                list_move_tail(&bf->list, &bf_head);
 
+               spin_unlock_bh(&txq->axq_lock);
                fi = get_frame_info(bf->bf_mpdu);
                if (fi->retries) {
                        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)
                } else {
                        ath_tx_send_normal(sc, txq, tid, &bf_head);
                }
+               spin_lock_bh(&txq->axq_lock);
        }
 
        spin_unlock_bh(&txq->axq_lock);