mt7915: Fix he_mcs capabilities for 160mhz.
Subsystems (2)
PATCH 1/1 mt7915: Fix he_mcs capabilities for 160mhz.
From: Ben Greear <[email protected]>
At 160, this chip can only do 2x2 NSS. Fix the features accordingly, verified it shows up properly in iw phy foo info now.
Signed-off-by Ben Greear <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/init.c +11 -4
@@ -615,12 +615,19 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, {int i, idx =0 , nss =hweight8 (phy->mt76->chainmask);u16 mcs_map =0 ; +u16 mcs_map_160 =0 ;for (i =0 ; i <8 ; i++) {if (i < nss) mcs_map |= (IEEE80211_HE_MCS_SUPPORT_0_11 << (i *2 ));else mcs_map |= (IEEE80211_HE_MCS_NOT_SUPPORTED << (i *2 )); + +/* Can do 1/2 of NSS streams in 160Mhz mode. */ +if (i < nss/2 ) + mcs_map_160 |= (IEEE80211_HE_MCS_SUPPORT_0_11 << (i *2 )); +else + mcs_map_160 |= (IEEE80211_HE_MCS_NOT_SUPPORTED << (i *2 )); }for (i =0 ; i <NUM_NL80211_IFTYPES ; i++) {
@@ -722,10 +729,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, he_mcs->rx_mcs_80 =cpu_to_le16 (mcs_map); he_mcs->tx_mcs_80 =cpu_to_le16 (mcs_map); - he_mcs->rx_mcs_160 =cpu_to_le16 (mcs_map); - he_mcs->tx_mcs_160 =cpu_to_le16 (mcs_map); - he_mcs->rx_mcs_80p80 =cpu_to_le16 (mcs_map); - he_mcs->tx_mcs_80p80 =cpu_to_le16 (mcs_map); + he_mcs->rx_mcs_160 =cpu_to_le16 (mcs_map_160); + he_mcs->tx_mcs_160 =cpu_to_le16 (mcs_map_160); + he_mcs->rx_mcs_80p80 =cpu_to_le16 (mcs_map_160); + he_mcs->tx_mcs_80p80 =cpu_to_le16 (mcs_map_160);mt7915_set_stream_he_txbf_caps (he_cap, i, nss);
Signature · 1 line
2.20.1