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

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

ath9k_hw: clean up tx completion interrupt handling 



TXQ_FLAG_TXOKINT_ENABLE and TXQ_FLAG_TXERRINT_ENABLE are always set and
used together, and they share the same bitmask in enum ath9k_tx_queue_flags.
Simplify the code that tests for these flags.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7e03072e

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

+3 −4
Original line number Diff line number Diff line
@@ -516,10 +516,10 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q) 
		REG_WRITE(ah, AR_Q_DESC_CRCCHK, AR_Q_DESC_CRCCHK_EN);



	ath9k_hw_clear_queue_interrupts(ah, q);

	if (qi->tqi_qflags & TXQ_FLAG_TXOKINT_ENABLE)

	if (qi->tqi_qflags & TXQ_FLAG_TXINT_ENABLE) {

		ah->txok_interrupt_mask |= 1 << q;

	if (qi->tqi_qflags & TXQ_FLAG_TXERRINT_ENABLE)

		ah->txerr_interrupt_mask |= 1 << q;

	}

	if (qi->tqi_qflags & TXQ_FLAG_TXDESCINT_ENABLE)

		ah->txdesc_interrupt_mask |= 1 << q;

	if (qi->tqi_qflags & TXQ_FLAG_TXEOLINT_ENABLE)
@@ -743,8 +743,7 @@ int ath9k_hw_beaconq_setup(struct ath_hw *ah) 
	qi.tqi_cwmax = 0;



	if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)

		qi.tqi_qflags = TXQ_FLAG_TXOKINT_ENABLE |

				TXQ_FLAG_TXERRINT_ENABLE;

		qi.tqi_qflags = TXQ_FLAG_TXINT_ENABLE;



	return ath9k_hw_setuptxqueue(ah, ATH9K_TX_QUEUE_BEACON, &qi);

}

drivers/net/wireless/ath/ath9k/mac.h

+1 −2
Original line number Diff line number Diff line
@@ -583,8 +583,7 @@ enum ath9k_tx_queue { 
#define ATH9K_WME_UPSD	4



enum ath9k_tx_queue_flags {

	TXQ_FLAG_TXOKINT_ENABLE = 0x0001,

	TXQ_FLAG_TXERRINT_ENABLE = 0x0001,

	TXQ_FLAG_TXINT_ENABLE = 0x0001,

	TXQ_FLAG_TXDESCINT_ENABLE = 0x0002,

	TXQ_FLAG_TXEOLINT_ENABLE = 0x0004,

	TXQ_FLAG_TXURNINT_ENABLE = 0x0008,

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

+1 −2
Original line number Diff line number Diff line
@@ -1355,8 +1355,7 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype) 
	 * based intr on the EOSP frames.

	 */

	if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {

		qi.tqi_qflags = TXQ_FLAG_TXOKINT_ENABLE |

				TXQ_FLAG_TXERRINT_ENABLE;

		qi.tqi_qflags = TXQ_FLAG_TXINT_ENABLE;

	} else {

		if (qtype == ATH9K_TX_QUEUE_UAPSD)

			qi.tqi_qflags = TXQ_FLAG_TXDESCINT_ENABLE;