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

Commit cc591d77 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Kalle Valo
Browse files

ath9k: Make sure to zero status.tx_time before reporting TX status 



Since ath9k reports airtime usage directly using the
ieee80211_report_airtime() callback, it shouldn't also report it using the
tx_time in status. Make sure the field is zeroed before TX status is
reported to avoid spurious airtime being accounted by bits being left over
from earlier uses of the cb.

Fixes: 89cea749 ("ath9k: Switch to mac80211 TXQ scheduling and airtime APIs")
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 15493239

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

+3 −0
Original line number Diff line number Diff line
@@ -2552,6 +2552,9 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf, 
	}



	tx_info->status.rates[tx_rateindex].count = ts->ts_longretry + 1;



	/* we report airtime in ath_tx_count_airtime(), don't report twice */

	tx_info->status.tx_time = 0;

}



static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)