| From 89645512f06c5bf9be13f774acda12341f22784c Mon Sep 17 00:00:00 2001 |
| From: MeiChia Chiu <meichia.chiu@mediatek.com> |
| Date: Wed, 24 May 2023 22:35:54 +0800 |
| Subject: [PATCH 1032/1048] wifi: mt76: mt7915: remove BW160 support |
| |
| Remove BW160 capability in mt7915. |
| --- |
| mt7915/init.c | 26 ++++++-------------------- |
| 1 file changed, 6 insertions(+), 20 deletions(-) |
| |
| diff --git a/mt7915/init.c b/mt7915/init.c |
| index 9d05d12..5a3a61c 100644 |
| --- a/mt7915/init.c |
| +++ b/mt7915/init.c |
| @@ -439,11 +439,6 @@ mt7915_init_wiphy(struct mt7915_phy *phy) |
| vht_cap->cap |= |
| IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 | |
| IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK; |
| - |
| - if (!dev->dbdc_support) |
| - vht_cap->cap |= |
| - IEEE80211_VHT_CAP_SHORT_GI_160 | |
| - FIELD_PREP(IEEE80211_VHT_CAP_EXT_NSS_BW_MASK, 1); |
| } else { |
| phy->mt76->sband_5g.sband.ht_cap.ampdu_density = |
| IEEE80211_HT_MPDU_DENSITY_2; |
| @@ -899,13 +894,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy, |
| int sts = hweight8(phy->mt76->chainmask); |
| u8 c, sts_160 = sts; |
| |
| - /* Can do 1/2 of STS in 160Mhz mode for mt7915 */ |
| - if (is_mt7915(&dev->mt76)) { |
| - if (!dev->dbdc_support) |
| - sts_160 /= 2; |
| - else |
| - sts_160 = 0; |
| - } |
| + /* mt7915 doesn't support bw160 */ |
| + if (is_mt7915(&dev->mt76)) |
| + sts_160 = 0; |
| |
| #ifdef CONFIG_MAC80211_MESH |
| if (vif == NL80211_IFTYPE_MESH_POINT) |
| @@ -985,15 +976,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, |
| int i, idx = 0, nss = hweight8(phy->mt76->antenna_mask); |
| u16 mcs_map = 0; |
| u16 mcs_map_160 = 0; |
| - u8 nss_160; |
| + u8 nss_160 = nss; |
| |
| - if (!is_mt7915(&dev->mt76)) |
| - nss_160 = nss; |
| - else if (!dev->dbdc_support) |
| - /* Can do 1/2 of NSS streams in 160Mhz mode for mt7915 */ |
| - nss_160 = nss / 2; |
| - else |
| - /* Can't do 160MHz with mt7915 dbdc */ |
| + /* Can't do 160MHz with mt7915 */ |
| + if (is_mt7915(&dev->mt76)) |
| nss_160 = 0; |
| |
| for (i = 0; i < 8; i++) { |
| -- |
| 2.18.0 |
| |