ath9k: fix recursive locking in the tx flush path
authorFelix Fietkau <nbd@openwrt.org>
Sat, 20 Nov 2010 02:08:46 +0000 (03:08 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 Nov 2010 20:58:38 +0000 (15:58 -0500)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Tested-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/xmit.c

index c63e283..495432e 100644 (file)
@@ -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);