Commit 6b430f72 authored by Felix Fietkau's avatar Felix Fietkau Committed by Kalle Valo
Browse files

wifi: mt76: fix rate reporting / throughput regression on mt7915 and newer 



mt7915 and newer need to report the rate_info that's stored in wcid->rate,
since they don't fill info->status.rates.

Cc: Jonas Jelonek <jelonek.jonas@gmail.com>
Reported-by: default avatarMikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
Link: https://lore.kernel.org/all/CABXGCsP0znm9pS-MiKtyxTXR7XiyFVqen0qzNpicGHDZKCzbwg@mail.gmail.com/


Fixes: 44fa75f2 ("mac80211: extend current rate control tx status API")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Tested-by: default avatarMikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220927093823.6007-1-nbd@nbd.name
parent 0326074f

drivers/net/wireless/mediatek/mt76/tx.c

+8 −2
Original line number Diff line number Diff line
@@ -60,15 +60,21 @@ mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list) 
			.skb = skb,

			.info = IEEE80211_SKB_CB(skb),

		};

		struct ieee80211_rate_status rs = {};

		struct mt76_tx_cb *cb = mt76_tx_skb_cb(skb);

		struct mt76_wcid *wcid;



		wcid = rcu_dereference(dev->wcid[cb->wcid]);

		if (wcid) {

			status.sta = wcid_to_sta(wcid);

			status.rates = NULL;

			if (status.sta && (wcid->rate.flags || wcid->rate.legacy)) {

				rs.rate_idx = wcid->rate;

				status.rates = &rs;

				status.n_rates = 1;

			} else {

				status.n_rates = 0;

			}

		}



		hw = mt76_tx_status_get_hw(dev, skb);

		ieee80211_tx_status_ext(hw, &status);