From: Toke Høiland-Jørgensen Date: Fri, 15 Feb 2019 16:48:55 +0000 (+0100) Subject: ath9k: Make sure to zero status.tx_time before reporting TX status X-Git-Tag: v5.4-rc1~1056^2~37^2~60^2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc591d77aba12ee69fedd12140b3dfa0816c178a;p=platform%2Fkernel%2Flinux-rpi.git 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: 89cea7493a34 ("ath9k: Switch to mac80211 TXQ scheduling and airtime APIs") Signed-off-by: Toke Høiland-Jørgensen Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 06e0c5a..773d428 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -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)