2019-02-15 16:49:21

by Toke Høiland-Jørgensen

Subject: [PATCH] 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 <[email protected]>
---
drivers/net/wireless/ath/ath9k/xmit.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 06e0c5a6fab6..773d428ff1b0 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)
--
2.20.1

2019-02-26 13:07:55

by Kalle Valo

Subject: Re: [PATCH] ath9k: Make sure to zero status.tx_time before reporting TX status

Toke Høiland-Jørgensen wrote:

> 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 <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

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

--
https://patchwork.kernel.org/patch/10815445/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches