[][mac80211][Rebase Patches][mt76 build fail]
[Description]
Fix MT76 WiFi-6 Build Fail
mt76-2023-07-14-bb3937d5
[Release-log]
N/A
Change-Id: I59e57443a08f7c37913ccf696f34d6454e3298db
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7754734
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch
index fe833e5..5af4002 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-mt7915-update-mpdu-density-in-2-5g-capabil.patch
@@ -1,8 +1,7 @@
-From 50f77fea3f310a623f0fc3656f1a28a7e769c598 Mon Sep 17 00:00:00 2001
+From 676c2c7677ee75ee7a041711cc00f0360071f371 Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Wed, 24 May 2023 10:17:38 +0800
-Subject: [PATCH 6/7] wifi: mt76: mt7915: update mpdu density in 2/5g
- capability
+Subject: [PATCH] wifi: mt76: mt7915: update mpdu density in 2/5g capability
Set mpdu density to 2 usec to meet hardware capability
and also update enhance throughput.
@@ -13,7 +12,7 @@
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/mt7915/init.c b/mt7915/init.c
-index a47a980..75f8d96 100644
+index 5baa571..2eec451 100644
--- a/mt7915/init.c
+++ b/mt7915/init.c
@@ -398,8 +398,12 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
@@ -45,8 +44,8 @@
vht_cap->cap |=
IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
-@@ -423,6 +428,9 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
- IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |
+@@ -422,6 +427,9 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+ 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 =
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-remove-BW160-support.patch b/autobuild_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-remove-BW160-support.patch
index 77ad7f1..92e9979 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-remove-BW160-support.patch
+++ b/autobuild_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-remove-BW160-support.patch
@@ -1,33 +1,30 @@
-From a16f98e2a2abcda88b80b5614d38b4083e30b59f Mon Sep 17 00:00:00 2001
+From d6cc947da30142156eaab17bf568e0dc8ef7be07 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 1031/1031] wifi: mt76: mt7915: remove BW160 support
+Subject: [PATCH] wifi: mt76: mt7915: remove BW160 support
Remove BW160 capability in mt7915.
---
- mt7915/init.c | 29 +++++++----------------------
- 1 file changed, 7 insertions(+), 22 deletions(-)
+ mt7915/init.c | 26 ++++++--------------------
+ 1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/mt7915/init.c b/mt7915/init.c
-index 09ee080..bc16f17 100644
+index 63c0ecb..6a29524 100644
--- a/mt7915/init.c
+++ b/mt7915/init.c
-@@ -420,13 +420,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
-
+@@ -422,11 +422,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;
+ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
-
- if (!dev->dbdc_support)
- vht_cap->cap |=
- IEEE80211_VHT_CAP_SHORT_GI_160 |
-- IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ |
- FIELD_PREP(IEEE80211_VHT_CAP_EXT_NSS_BW_MASK, 1);
-+ IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;;
} else {
phy->mt76->sband_5g.sband.ht_cap.ampdu_density =
IEEE80211_HT_MPDU_DENSITY_2;
-@@ -886,13 +880,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy,
+@@ -886,13 +881,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy,
int sts = hweight8(phy->mt76->chainmask);
u8 c, sts_160 = sts;
@@ -44,7 +41,7 @@
#ifdef CONFIG_MAC80211_MESH
if (vif == NL80211_IFTYPE_MESH_POINT)
-@@ -972,15 +962,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
+@@ -972,15 +963,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;