Commit c6d3e16a authored by Howard Hsu's avatar Howard Hsu Committed by Felix Fietkau
Browse files

wifi: mt76: mt7915: fix mcs value in ht mode 



Fix the error that mcs will be reduced to a range of 0 to 7 in ht mode.

Fixes: 70fd1333 ("mt76: mt7915: rework .set_bitrate_mask() to support more options")
Signed-off-by: default avatarHoward Hsu <howard-yh.hsu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b78f67bf

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+6 −4
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev, 
	struct sta_phy phy = {};

	int ret, nrates = 0;



#define __sta_phy_bitrate_mask_check(_mcs, _gi, _he)				\

#define __sta_phy_bitrate_mask_check(_mcs, _gi, _ht, _he)			\

	do {									\

		u8 i, gi = mask->control[band]._gi;				\

		gi = (_he) ? gi : gi == NL80211_TXRATE_FORCE_SGI;		\
@@ -1373,15 +1373,17 @@ mt7915_mcu_add_rate_ctrl_fixed(struct mt7915_dev *dev, 
				continue;					\

			nrates += hweight16(mask->control[band]._mcs[i]);	\

			phy.mcs = ffs(mask->control[band]._mcs[i]) - 1;		\

			if (_ht)						\

				phy.mcs += 8 * i;				\

		}								\

	} while (0)



	if (sta->deflink.he_cap.has_he) {

		__sta_phy_bitrate_mask_check(he_mcs, he_gi, 1);

		__sta_phy_bitrate_mask_check(he_mcs, he_gi, 0, 1);

	} else if (sta->deflink.vht_cap.vht_supported) {

		__sta_phy_bitrate_mask_check(vht_mcs, gi, 0);

		__sta_phy_bitrate_mask_check(vht_mcs, gi, 0, 0);

	} else if (sta->deflink.ht_cap.ht_supported) {

		__sta_phy_bitrate_mask_check(ht_mcs, gi, 0);

		__sta_phy_bitrate_mask_check(ht_mcs, gi, 1, 0);

	} else {

		nrates = hweight32(mask->control[band].legacy);

		phy.mcs = ffs(mask->control[band].legacy) - 1;