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

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

ath9k: remove the unnecessary private xretry tx flag 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,7 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, 
		is_underrun = 1;

	}



	if (tx_info->pad[0] & ATH_TX_INFO_XRETRY)

	if (!(tx_info->flags & IEEE80211_TX_STAT_ACK))

		tx_status = 1;



	ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status,

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

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ struct ath_rate_priv { 


#define ATH_TX_INFO_FRAME_TYPE_INTERNAL	(1 << 0)

#define ATH_TX_INFO_FRAME_TYPE_PAUSE	(1 << 1)

#define ATH_TX_INFO_XRETRY		(1 << 3)

#define ATH_TX_INFO_UNDERRUN		(1 << 4)



enum ath9k_internal_frame_type {

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

+0 −3
Original line number Diff line number Diff line
@@ -1993,9 +1993,6 @@ static void ath_tx_rc_status(struct ath_buf *bf, struct ath_tx_status *ts, 
			if (ts->ts_flags &

			    (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN))

				tx_info->pad[0] |= ATH_TX_INFO_UNDERRUN;

			if ((ts->ts_status & ATH9K_TXERR_XRETRY) ||

			    (ts->ts_status & ATH9K_TXERR_FIFO))

				tx_info->pad[0] |= ATH_TX_INFO_XRETRY;

		}

	}