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

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

ath9k: fix rate handling/reporting 



This patch fixes some issues introduced in the rate control API rework.
When not running aggregation, copy bf->rates into info->control.rates
before applying the rate control status to it.
In ath_lookup_rate, the rates need to be pulled from bf->rates, not the
tx info.

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

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

+7 −2
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq, 
				  struct ath_tx_status *ts, struct ath_buf *bf,

				  struct list_head *bf_head)

{

	struct ieee80211_tx_info *info;

	bool txok, flush;



	txok = !(ts->ts_status & ATH9K_TXERR_MASK);
@@ -641,8 +642,12 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq, 
		txq->axq_ampdu_depth--;



	if (!bf_isampdu(bf)) {

		if (!flush)

		if (!flush) {

			info = IEEE80211_SKB_CB(bf->bf_mpdu);

			memcpy(info->control.rates, bf->rates,

			       sizeof(info->control.rates));

			ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);

		}

		ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok);

	} else

		ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok);
@@ -686,7 +691,7 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, 


	skb = bf->bf_mpdu;

	tx_info = IEEE80211_SKB_CB(skb);

	rates = tx_info->control.rates;

	rates = bf->rates;



	/*

	 * Find the lowest frame length among the rate series that will have a