Commit 3eb514dd authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: mt7615: fix using VHT STBC rates 



The hardware expects MT_TX_RATE_NSS to be filled with the number of
space/time streams. For non-STBC rates, this is equal to nss.
For 1-stream STBC, this needs to be set to 2.
This is relevant for VHT rates only, on HT, the value is derived from MCS
internally.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent cf211051

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+12 −6
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev, 
		       bool stbc, u8 *bw)

{

	u8 phy, nss, rate_idx;

	u16 rateval;

	u16 rateval = 0;



	*bw = 0;
@@ -292,13 +292,15 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev, 
		rate_idx = val & 0xff;

	}



	rateval = (FIELD_PREP(MT_TX_RATE_IDX, rate_idx) |

	if (stbc && nss == 1) {

		nss++;

		rateval |= MT_TX_RATE_STBC;

	}



	rateval |= (FIELD_PREP(MT_TX_RATE_IDX, rate_idx) |

		    FIELD_PREP(MT_TX_RATE_MODE, phy) |

		    FIELD_PREP(MT_TX_RATE_NSS, nss - 1));



	if (stbc && nss == 1)

		rateval |= MT_TX_RATE_STBC;



	return rateval;

}
@@ -771,6 +773,10 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta, 
		break;

	case MT_PHY_TYPE_VHT:

		final_nss = FIELD_GET(MT_TX_RATE_NSS, final_rate);



		if ((final_rate & MT_TX_RATE_STBC) && final_nss)

			final_nss--;



		final_rate_flags |= IEEE80211_TX_RC_VHT_MCS;

		final_rate = (final_rate & MT_TX_RATE_IDX) | (final_nss << 4);

		break;