From d00c6169c7cc5b6ead9d8a895cc3f6dfde7573a3 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi Date: Mon, 4 Jun 2018 11:19:41 +0200 Subject: [PATCH] mt76x2: fix mrr idx/count estimation in mt76x2_mac_fill_tx_status() Fix mcs and attempt count estimation in mt76x2_mac_fill_tx_status routine if the number of tx retries reported by the hw is grater than IEEE80211_TX_MAX_RATES Fixes: 7bc04215a66b ("mt76: add driver code for MT76x2e") Signed-off-by: Lorenzo Bianconi Signed-off-by: Kalle Valo --- mt76x2_mac.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mt76x2_mac.c b/mt76x2_mac.c index cf873a3b..e5e92f79 100644 --- a/mt76x2_mac.c +++ b/mt76x2_mac.c @@ -456,15 +456,13 @@ mt76x2_mac_fill_tx_status(struct mt76x2_dev *dev, if (last_rate < IEEE80211_TX_MAX_RATES - 1) rate[last_rate + 1].idx = -1; - cur_idx = rate[last_rate].idx + st->retry; + cur_idx = rate[last_rate].idx + last_rate; for (i = 0; i <= last_rate; i++) { rate[i].flags = rate[last_rate].flags; rate[i].idx = max_t(int, 0, cur_idx - i); rate[i].count = 1; } - - if (last_rate > 0) - rate[last_rate - 1].count = st->retry + 1 - last_rate; + rate[last_rate].count = st->retry + 1 - last_rate; info->status.ampdu_len = n_frames; info->status.ampdu_ack_len = st->success ? n_frames : 0;