2021-07-20 18:27:04

by Ben Greear

[permalink] [raw]
Subject: [PATCH 11/11] mt76: mt7915: add a missing HT flag for GI parsing

From: Ryder Lee <[email protected]>

The previous commit missed a HT flag.

Fixes: 14b220c07188 ("mt76: mt7915: report tx rate directly from tx status")
Signed-off-by: Ryder Lee <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index e77341ca127c..cd8179331e28 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -215,7 +215,8 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)

rate->he_gi = (val & (0x3 << offs)) >> offs;
msta->wcid.rate_he_gi = rate->he_gi; /* cache for later */
- } else if (rate->flags & RATE_INFO_FLAGS_VHT_MCS) {
+ } else if (rate->flags &
+ (RATE_INFO_FLAGS_VHT_MCS | RATE_INFO_FLAGS_MCS)) {
if (val & BIT(12 + bw)) {
rate->flags |= RATE_INFO_FLAGS_SHORT_GI;
msta->wcid.rate_short_gi = 1;
@@ -225,7 +226,6 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)
msta->wcid.rate_short_gi = 0;
}
}
- /* TODO: Deal with HT_MCS */
}

rcu_read_unlock();
--
2.20.1