blob: 679446b0525b0218c9085b714ae02dc0248a0259 [file] [log] [blame]
developerebda9012024-02-22 13:42:45 +08001From 89645512f06c5bf9be13f774acda12341f22784c Mon Sep 17 00:00:00 2001
developer8e5fecd2023-05-30 11:58:00 +08002From: MeiChia Chiu <meichia.chiu@mediatek.com>
3Date: Wed, 24 May 2023 22:35:54 +0800
developerebda9012024-02-22 13:42:45 +08004Subject: [PATCH 1032/1048] wifi: mt76: mt7915: remove BW160 support
developer8e5fecd2023-05-30 11:58:00 +08005
6Remove BW160 capability in mt7915.
7---
developer26d6cc52023-07-31 12:27:06 +08008 mt7915/init.c | 26 ++++++--------------------
9 1 file changed, 6 insertions(+), 20 deletions(-)
developer8e5fecd2023-05-30 11:58:00 +080010
11diff --git a/mt7915/init.c b/mt7915/init.c
developerebda9012024-02-22 13:42:45 +080012index 9d05d12..5a3a61c 100644
developer8e5fecd2023-05-30 11:58:00 +080013--- a/mt7915/init.c
14+++ b/mt7915/init.c
developerebda9012024-02-22 13:42:45 +080015@@ -439,11 +439,6 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
developer8e5fecd2023-05-30 11:58:00 +080016 vht_cap->cap |=
17 IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
developer26d6cc52023-07-31 12:27:06 +080018 IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
developer8e5fecd2023-05-30 11:58:00 +080019-
20- if (!dev->dbdc_support)
21- vht_cap->cap |=
22- IEEE80211_VHT_CAP_SHORT_GI_160 |
developer8e5fecd2023-05-30 11:58:00 +080023- FIELD_PREP(IEEE80211_VHT_CAP_EXT_NSS_BW_MASK, 1);
24 } else {
developer004e50c2023-06-29 20:33:22 +080025 phy->mt76->sband_5g.sband.ht_cap.ampdu_density =
26 IEEE80211_HT_MPDU_DENSITY_2;
developerebda9012024-02-22 13:42:45 +080027@@ -899,13 +894,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy,
developer8e5fecd2023-05-30 11:58:00 +080028 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 */
developer004e50c2023-06-29 20:33:22 +080032- if (is_mt7915(&dev->mt76)) {
developer8e5fecd2023-05-30 11:58:00 +080033- if (!dev->dbdc_support)
34- sts_160 /= 2;
35- else
36- sts_160 = 0;
developer004e50c2023-06-29 20:33:22 +080037- }
38+ /* mt7915 doesn't support bw160 */
39+ if (is_mt7915(&dev->mt76))
developer8e5fecd2023-05-30 11:58:00 +080040+ sts_160 = 0;
developer8e5fecd2023-05-30 11:58:00 +080041
42 #ifdef CONFIG_MAC80211_MESH
developer004e50c2023-06-29 20:33:22 +080043 if (vif == NL80211_IFTYPE_MESH_POINT)
developerebda9012024-02-22 13:42:45 +080044@@ -985,15 +976,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
developer8e5fecd2023-05-30 11:58:00 +080045 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--
developere35b8e42023-10-16 11:04:00 +0800642.18.0
developer8e5fecd2023-05-30 11:58:00 +080065