blob: cad596496959579db4fca24e726a95f75a4f65c7 [file] [log] [blame]
developer0443cd32023-09-19 14:11:49 +08001From 45e1cac480f32d75ec7f13389594768eb471ca66 Mon Sep 17 00:00:00 2001
developer6b3eef82023-05-24 22:42:31 +08002From: MeiChia Chiu <meichia.chiu@mediatek.com>
3Date: Wed, 24 May 2023 22:35:54 +0800
developer0443cd32023-09-19 14:11:49 +08004Subject: [PATCH 1032/1040] wifi: mt76: mt7915: remove BW160 support
developer6b3eef82023-05-24 22:42:31 +08005
6Remove BW160 capability in mt7915.
7---
developerc2dc4722023-07-17 13:20:33 +08008 mt7915/init.c | 26 ++++++--------------------
9 1 file changed, 6 insertions(+), 20 deletions(-)
developer6b3eef82023-05-24 22:42:31 +080010
11diff --git a/mt7915/init.c b/mt7915/init.c
developer0443cd32023-09-19 14:11:49 +080012index d908a58..a942bc2 100644
developer6b3eef82023-05-24 22:42:31 +080013--- a/mt7915/init.c
14+++ b/mt7915/init.c
developer0443cd32023-09-19 14:11:49 +080015@@ -431,11 +431,6 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
developer6b3eef82023-05-24 22:42:31 +080016 vht_cap->cap |=
17 IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
developerc2dc4722023-07-17 13:20:33 +080018 IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
developer6b3eef82023-05-24 22:42:31 +080019-
20- if (!dev->dbdc_support)
21- vht_cap->cap |=
22- IEEE80211_VHT_CAP_SHORT_GI_160 |
developer6b3eef82023-05-24 22:42:31 +080023- FIELD_PREP(IEEE80211_VHT_CAP_EXT_NSS_BW_MASK, 1);
24 } else {
developer2157bf82023-06-26 02:27:49 +080025 phy->mt76->sband_5g.sband.ht_cap.ampdu_density =
26 IEEE80211_HT_MPDU_DENSITY_2;
developer0443cd32023-09-19 14:11:49 +080027@@ -891,13 +886,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy,
developer6b3eef82023-05-24 22:42:31 +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 */
developer2157bf82023-06-26 02:27:49 +080032- if (is_mt7915(&dev->mt76)) {
developer6b3eef82023-05-24 22:42:31 +080033- if (!dev->dbdc_support)
34- sts_160 /= 2;
35- else
36- sts_160 = 0;
developer2157bf82023-06-26 02:27:49 +080037- }
38+ /* mt7915 doesn't support bw160 */
39+ if (is_mt7915(&dev->mt76))
developer6b3eef82023-05-24 22:42:31 +080040+ sts_160 = 0;
developer6b3eef82023-05-24 22:42:31 +080041
42 #ifdef CONFIG_MAC80211_MESH
developer2157bf82023-06-26 02:27:49 +080043 if (vif == NL80211_IFTYPE_MESH_POINT)
developer0443cd32023-09-19 14:11:49 +080044@@ -977,15 +968,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
developer6b3eef82023-05-24 22:42:31 +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--
developer0443cd32023-09-19 14:11:49 +0800642.18.0
developer6b3eef82023-05-24 22:42:31 +080065