developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 1 | From 7c0b8498964ddc1708cd5fd949e70d70d7cc7207 Mon Sep 17 00:00:00 2001 |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 2 | From: MeiChia Chiu <meichia.chiu@mediatek.com> |
| 3 | Date: Wed, 24 May 2023 22:35:54 +0800 |
developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 4 | Subject: [PATCH 1029/1051] wifi: mt76: mt7915: remove BW160 support |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 5 | |
| 6 | Remove BW160 capability in mt7915. |
| 7 | --- |
developer | f9b0021 | 2023-07-31 12:27:06 +0800 | [diff] [blame] | 8 | mt7915/init.c | 26 ++++++-------------------- |
| 9 | 1 file changed, 6 insertions(+), 20 deletions(-) |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 10 | |
| 11 | diff --git a/mt7915/init.c b/mt7915/init.c |
developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 12 | index f548d09..20d6efd 100644 |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 13 | --- a/mt7915/init.c |
| 14 | +++ b/mt7915/init.c |
developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 15 | @@ -440,11 +440,6 @@ mt7915_init_wiphy(struct mt7915_phy *phy) |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 16 | vht_cap->cap |= |
| 17 | IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 | |
developer | f9b0021 | 2023-07-31 12:27:06 +0800 | [diff] [blame] | 18 | IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK; |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 19 | - |
| 20 | - if (!dev->dbdc_support) |
| 21 | - vht_cap->cap |= |
| 22 | - IEEE80211_VHT_CAP_SHORT_GI_160 | |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 23 | - FIELD_PREP(IEEE80211_VHT_CAP_EXT_NSS_BW_MASK, 1); |
| 24 | } else { |
developer | 47efbdb | 2023-06-29 20:33:22 +0800 | [diff] [blame] | 25 | phy->mt76->sband_5g.sband.ht_cap.ampdu_density = |
| 26 | IEEE80211_HT_MPDU_DENSITY_2; |
developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 27 | @@ -865,13 +860,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy, |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 28 | int sts = hweight8(phy->mt76->chainmask); |
| 29 | u8 c, sts_160 = sts; |
| 30 | |
| 31 | - /* Can do 1/2 of STS in 160Mhz mode for mt7915 */ |
developer | 47efbdb | 2023-06-29 20:33:22 +0800 | [diff] [blame] | 32 | - if (is_mt7915(&dev->mt76)) { |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 33 | - if (!dev->dbdc_support) |
| 34 | - sts_160 /= 2; |
| 35 | - else |
| 36 | - sts_160 = 0; |
developer | 47efbdb | 2023-06-29 20:33:22 +0800 | [diff] [blame] | 37 | - } |
| 38 | + /* mt7915 doesn't support bw160 */ |
| 39 | + if (is_mt7915(&dev->mt76)) |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 40 | + sts_160 = 0; |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 41 | |
| 42 | #ifdef CONFIG_MAC80211_MESH |
developer | 47efbdb | 2023-06-29 20:33:22 +0800 | [diff] [blame] | 43 | if (vif == NL80211_IFTYPE_MESH_POINT) |
developer | a20cdc2 | 2024-05-31 18:57:31 +0800 | [diff] [blame] | 44 | @@ -955,15 +946,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 45 | int i, idx = 0, nss = hweight8(phy->mt76->antenna_mask); |
| 46 | u16 mcs_map = 0; |
| 47 | u16 mcs_map_160 = 0; |
| 48 | - u8 nss_160; |
| 49 | + u8 nss_160 = nss; |
| 50 | |
| 51 | - if (!is_mt7915(&dev->mt76)) |
| 52 | - nss_160 = nss; |
| 53 | - else if (!dev->dbdc_support) |
| 54 | - /* Can do 1/2 of NSS streams in 160Mhz mode for mt7915 */ |
| 55 | - nss_160 = nss / 2; |
| 56 | - else |
| 57 | - /* Can't do 160MHz with mt7915 dbdc */ |
| 58 | + /* Can't do 160MHz with mt7915 */ |
| 59 | + if (is_mt7915(&dev->mt76)) |
| 60 | nss_160 = 0; |
| 61 | |
| 62 | for (i = 0; i < 8; i++) { |
| 63 | -- |
developer | bd9fa1e | 2023-10-16 11:04:00 +0800 | [diff] [blame] | 64 | 2.18.0 |
developer | 6770571 | 2023-05-30 11:58:00 +0800 | [diff] [blame] | 65 | |