Message ID | 20220907095228.82072-1-nbd@nbd.name (mailing list archive) |
---|---|
State | Accepted |
Commit | 781b80f452fcc1cfc16ee41f12556626a9ced049 |
Delegated to: | Kalle Valo |
Headers | show |
Series | [6.0] mt76: fix 5 GHz connection regression on mt76x0/mt76x2 | expand |
Felix Fietkau <nbd@nbd.name> writes: > Some users have reported being unable to connect to MT76x0 APs running mt76 > after a commit enabling the VHT extneded NSS BW feature. > Fix this regression by ensuring that this feature only gets enabled on drivers > that support it > > Cc: stable@vger.kernel.org > Fixes: d9fcfc1424aa ("mt76: enable the VHT extended NSS BW feature") > Signed-off-by: Felix Fietkau <nbd@nbd.name> I assigned this to me on patchwork and I'll queue this to v6.0.
Felix Fietkau <nbd@nbd.name> wrote: > Some users have reported being unable to connect to MT76x0 APs running mt76 > after a commit enabling the VHT extneded NSS BW feature. > Fix this regression by ensuring that this feature only gets enabled on drivers > that support it > > Cc: stable@vger.kernel.org > Fixes: d9fcfc1424aa ("mt76: enable the VHT extended NSS BW feature") > Signed-off-by: Felix Fietkau <nbd@nbd.name> Patch applied to wireless.git, thanks. 781b80f452fc wifi: mt76: fix 5 GHz connection regression on mt76x0/mt76x2
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 253cbc1956d1..6de13d641438 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -267,7 +267,8 @@ static void mt76_init_stream_cap(struct mt76_phy *phy, } vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map); vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map); - vht_cap->vht_mcs.tx_highest |= + if (ieee80211_hw_check(phy->hw, SUPPORTS_VHT_EXT_NSS_BW)) + vht_cap->vht_mcs.tx_highest |= cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE); }
Some users have reported being unable to connect to MT76x0 APs running mt76 after a commit enabling the VHT extneded NSS BW feature. Fix this regression by ensuring that this feature only gets enabled on drivers that support it Cc: stable@vger.kernel.org Fixes: d9fcfc1424aa ("mt76: enable the VHT extended NSS BW feature") Signed-off-by: Felix Fietkau <nbd@nbd.name> --- drivers/net/wireless/mediatek/mt76/mac80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)