From bce80ae12580008bea56bd73b8a177a002c88ac4 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 2 Dec 2022 17:38:26 +0800 Subject: [PATCH] mt76: refresh patches Signed-off-by: Tianling Shen (cherry picked from commit 488f693b5dd5c09433f2dee993844b0236e0ab5a) --- .../0001-mt76-allow-VHT-rate-on-2.4GHz.patch | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch b/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch index 0a40968a98..27110f1870 100644 --- a/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch +++ b/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch @@ -1,4 +1,4 @@ -From ed0b9c38becdbf9379787ca0b4db557f03a31dd7 Mon Sep 17 00:00:00 2001 +From fcddb155b538beb0ca7614260a1323d64bfc656a Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Mon, 23 Nov 2020 10:46:37 +0800 Subject: [PATCH] mt76: allow VHT rate on 2.4GHz @@ -7,14 +7,13 @@ Allow chips that support 11ac to use 256QAM on 2.4GHz Signed-off-by: DENG Qingfang --- - mac80211.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + mac80211.c | 10 +++++----- + mt7615/init.c | 2 ++ + 2 files changed, 7 insertions(+), 5 deletions(-) -diff --git a/mac80211.c b/mac80211.c -index 766681a4..06aa4228 100644 --- a/mac80211.c +++ b/mac80211.c -@@ -264,7 +264,7 @@ static void mt76_init_stream_cap(struct mt76_phy *phy, +@@ -275,7 +275,7 @@ static void mt76_init_stream_cap(struct void mt76_set_stream_caps(struct mt76_phy *phy, bool vht) { if (phy->cap.has_2ghz) @@ -23,7 +22,7 @@ index 766681a4..06aa4228 100644 if (phy->cap.has_5ghz) mt76_init_stream_cap(phy, &phy->sband_5g.sband, vht); if (phy->cap.has_6ghz) -@@ -333,13 +333,13 @@ mt76_init_sband(struct mt76_phy *phy, struct mt76_sband *msband, +@@ -342,13 +342,13 @@ mt76_init_sband(struct mt76_phy *phy, st static int mt76_init_sband_2g(struct mt76_phy *phy, struct ieee80211_rate *rates, @@ -39,8 +38,8 @@ index 766681a4..06aa4228 100644 } static int -@@ -475,7 +475,7 @@ int mt76_register_phy(struct mt76_phy *phy, bool vht, - mt76_phy_init(phy, phy->hw); +@@ -496,7 +496,7 @@ int mt76_register_phy(struct mt76_phy *p + return ret; if (phy->cap.has_2ghz) { - ret = mt76_init_sband_2g(phy, rates, n_rates); @@ -48,8 +47,8 @@ index 766681a4..06aa4228 100644 if (ret) return ret; } -@@ -594,7 +594,7 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, - mt76_phy_init(phy, hw); +@@ -621,7 +621,7 @@ int mt76_register_device(struct mt76_dev + return ret; if (phy->cap.has_2ghz) { - ret = mt76_init_sband_2g(phy, rates, n_rates); @@ -57,3 +56,14 @@ index 766681a4..06aa4228 100644 if (ret) return ret; } +--- a/mt7615/init.c ++++ b/mt7615/init.c +@@ -409,6 +409,8 @@ mt7615_init_wiphy(struct ieee80211_hw *h + hw->max_tx_fragments = MT_HW_TXP_MAX_BUF_NUM; + + phy->mt76->sband_2g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING; ++ phy->mt76->sband_2g.sband.vht_cap.cap |= ++ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK; + phy->mt76->sband_5g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING; + phy->mt76->sband_5g.sband.vht_cap.cap |= + IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;