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

Commit 6d913f7d authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Remove ATH9K_TX_SW_ABORTED and introduce a bool for this purpose 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d826c832

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

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ struct ath_buf { 
	dma_addr_t bf_buf_addr;		/* physical addr of data buffer */

	bool bf_stale;

	bool bf_isnullfunc;

	bool bf_tx_aborted;

	u16 bf_flags;

	struct ath_buf_state bf_state;

	dma_addr_t bf_dmacontext;

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

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#define ATH9K_TX_DESC_CFG_ERR      0x04

#define ATH9K_TX_DATA_UNDERRUN     0x08

#define ATH9K_TX_DELIM_UNDERRUN    0x10

#define ATH9K_TX_SW_ABORTED        0x40

#define ATH9K_TX_SW_FILTERED       0x80



/* 64 bytes */

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

+4 −5
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
			acked_cnt++;

		} else {

			if (!(tid->state & AGGR_CLEANUP) &&

			    ts->ts_flags != ATH9K_TX_SW_ABORTED) {

			    !bf_last->bf_tx_aborted) {

				if (bf->bf_retries < ATH_MAX_SW_RETRIES) {

					ath_tx_set_retry(sc, txq, bf);

					txpending = 1;
@@ -1036,9 +1036,6 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx) 
	struct ath_tx_status ts;



	memset(&ts, 0, sizeof(ts));

	if (!retry_tx)

		ts.ts_flags = ATH9K_TX_SW_ABORTED;



	INIT_LIST_HEAD(&bf_head);



	for (;;) {
@@ -1063,6 +1060,8 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx) 
		}



		lastbf = bf->bf_lastbf;

		if (!retry_tx)

			lastbf->bf_tx_aborted = true;



		/* remove ath_buf's of the same mpdu from txq */

		list_cut_position(&bf_head, &txq->axq_q, &lastbf->list);
@@ -1897,7 +1896,7 @@ static int ath_tx_num_badfrms(struct ath_softc *sc, struct ath_buf *bf, 
	int nbad = 0;

	int isaggr = 0;



	if (ts->ts_flags == ATH9K_TX_SW_ABORTED)

	if (bf->bf_tx_aborted)

		return 0;



	isaggr = bf_isaggr(bf);