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

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

ath9k_hw: fix potential spurious tx error bit interpretation 



According to documentation, AR_ExcessiveRetries, AR_Filtered and
AR_FIFOUnderrun are only valid if AR_FrmXmitOK is clear.

Not checking this might result in suboptimal FIFO settings, unnecessary
retransmissions, or other connectivity issues.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 78a7685e

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

+9 −7
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, 
	status = ACCESS_ONCE(ads->ds_txstatus1);

	if (status & AR_FrmXmitOK)

		ts->ts_status |= ATH9K_TX_ACKED;

	else {

		if (status & AR_ExcessiveRetries)

			ts->ts_status |= ATH9K_TXERR_XRETRY;

		if (status & AR_Filtered)
@@ -245,6 +246,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, 
			ts->ts_status |= ATH9K_TXERR_FIFO;

			ath9k_hw_updatetxtriglevel(ah, true);

		}

	}

	if (status & AR_TxTimerExpired)

		ts->ts_status |= ATH9K_TXERR_TIMER_EXPIRED;

	if (status & AR_DescCfgErr)