Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/ath/ath9k/xmit.c

+2 −0
Original line number Diff line number Diff line
@@ -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);