2021-04-11 10:56:58

by Felix Fietkau

Subject: [PATCH] mt76: mt7921: remove 80+80 MHz support capabilities

This mode is not supported by the hardware

Signed-off-by: Felix Fietkau <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt7921/init.c | 3 ---
drivers/net/wireless/mediatek/mt76/mt7921/main.c | 4 ----
2 files changed, 7 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index 9046bbfc0690..b34db6e8d0ae 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -250,9 +250,6 @@ int mt7921_register_device(struct mt7921_dev *dev)
dev->mphy.sband_5g.sband.vht_cap.cap |=
IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
- dev->mphy.sband_5g.sband.vht_cap.cap |=
- IEEE80211_VHT_CAP_SHORT_GI_160 |
- IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ;
dev->mphy.hw->wiphy->available_antennas_rx = dev->mphy.chainmask;
dev->mphy.hw->wiphy->available_antennas_tx = dev->mphy.chainmask;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 32b1cd0bca1f..d9ec7d9bb1c4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -125,10 +125,6 @@ mt7921_init_he_caps(struct mt7921_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);

memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres));
if (he_cap_elem->phy_cap_info[6] &
--
2.30.1

2021-04-12 12:46:30

by Johannes Berg

Subject: Re: [PATCH] mt76: mt7921: remove 80+80 MHz support capabilities

On Sun, 2021-04-11 at 12:47 +0200, Felix Fietkau wrote:
> This mode is not supported by the hardware
>
You say this "mode" (singular), and the subject says "80+80",

> - he_mcs->rx_mcs_160 = cpu_to_le16(mcs_map);
> - he_mcs->tx_mcs_160 = cpu_to_le16(mcs_map);

but you proceed to also remove 160, was that intentional?

johannes

2021-04-12 14:36:20

by Felix Fietkau

Subject: Re: [PATCH] mt76: mt7921: remove 80+80 MHz support capabilities

On 2021-04-12 14:45, Johannes Berg wrote:
> On Sun, 2021-04-11 at 12:47 +0200, Felix Fietkau wrote:
>> This mode is not supported by the hardware
>>
> You say this "mode" (singular), and the subject says "80+80",
>
>> - he_mcs->rx_mcs_160 = cpu_to_le16(mcs_map);
>> - he_mcs->tx_mcs_160 = cpu_to_le16(mcs_map);
>
> but you proceed to also remove 160, was that intentional?
Yes. 160 MHz isn't supported and no capability was set for it either.

- Felix