Commit 185d1589 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: Remove unnecessary AMPDU check at tx status 



Fill the ampdu_[ack]_len for both aggregation and normal frames.
So that we could avoid unnecesary conditional at tx status.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 89888e36

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

+0 −6
Original line number Diff line number Diff line
@@ -1362,12 +1362,6 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, 
	if (tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED)

		return;



	if (!(tx_info->flags & IEEE80211_TX_STAT_AMPDU)) {

		tx_info->status.ampdu_ack_len =

			(tx_info->flags & IEEE80211_TX_STAT_ACK ? 1 : 0);

		tx_info->status.ampdu_len = 1;

	}



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

		tx_status = 1;

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

+2 −3
Original line number Diff line number Diff line
@@ -2043,10 +2043,9 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf, 
		tx_info->flags |= IEEE80211_TX_STAT_AMPDU;



		BUG_ON(nbad > nframes);



	}

	tx_info->status.ampdu_len = nframes;

	tx_info->status.ampdu_ack_len = nframes - nbad;

	}



	if ((ts->ts_status & ATH9K_TXERR_FILT) == 0 &&

	    (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) == 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE