[][MAC80211][misc][Update Release Information v2]
[Description]
Change Filogic 880/860 WiFi7 MLO Alpha Release.
Sync internal latest 20240425 version.
[Release-log]
N/A
Change-Id: Ie29a3ac30ef9a24cd4356d1d4bbb97cba19e9325
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8991578
diff --git a/21.02/files/target/linux/mediatek/mt7988/config-5.4 b/21.02/files/target/linux/mediatek/mt7988/config-5.4
index 36972a2..c93cce9 100644
--- a/21.02/files/target/linux/mediatek/mt7988/config-5.4
+++ b/21.02/files/target/linux/mediatek/mt7988/config-5.4
@@ -331,6 +331,7 @@
# CONFIG_NET_DSA_AN8855 is not set
CONFIG_NET_DSA_MT7530=y
# CONFIG_NET_DSA_TAG_ARHT is not set
+# CONFIG_NET_DSA_TAG_AIROHA is not set
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_FLOW_LIMIT=y
CONFIG_NET_MEDIATEK_SOC=y
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
index 2fe4fef..52e91c0 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
@@ -1,4 +1,4 @@
-From 14fd30e05515edba0fcca8a7238d402cb2d9dd27 Mon Sep 17 00:00:00 2001
+From 5f294c8632c08814df00df8ed297e852d21b0e02 Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Fri, 19 Jan 2024 15:22:00 +0800
Subject: [PATCH 44/61] mtk: wifi: mac80211: add wds mlo support
@@ -11,9 +11,9 @@
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
---
net/mac80211/cfg.c | 7 -------
- net/mac80211/iface.c | 19 +++++++++++--------
+ net/mac80211/iface.c | 23 +++++++++++++++--------
net/mac80211/mlme.c | 15 +++++++++------
- 3 files changed, 20 insertions(+), 21 deletions(-)
+ 3 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 3233e2a..0cb68fb 100644
@@ -41,10 +41,10 @@
}
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 0ae31a9..083da12 100644
+index 0ae31a9..fce9834 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -381,19 +381,22 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
+@@ -381,19 +381,26 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
nsdata->vif.type))
return -ENOTUNIQ;
@@ -68,6 +68,10 @@
+ sdata->vif.active_links = nsdata->vif.active_links;
+ sdata->vif.dormant_links = nsdata->vif.dormant_links;
+ for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) {
++ if (!ieee80211_vif_is_mld(&nsdata->vif) &&
++ sdata->link[i] == &sdata->deflink)
++ continue;
++
+ sdata->link[i] = nsdata->link[i];
+ sdata->vif.link_conf[i] = nsdata->vif.link_conf[i];
+ }
@@ -119,5 +123,5 @@
if (!assoc_data)
return -ENOMEM;
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
index c23b9a6..1bb036d 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
@@ -1,4 +1,4 @@
-From 9a234460e4fcc0013ade098c9e8efb6f201068fc Mon Sep 17 00:00:00 2001
+From 65e5845ce53a6060cb3201a7dcae96b57eb2ea45 Mon Sep 17 00:00:00 2001
From: Shayne Chen <shayne.chen@mediatek.com>
Date: Mon, 29 Jan 2024 18:37:15 +0800
Subject: [PATCH 45/61] mtk: mac80211: fix ieee80211_probe_client warning
@@ -33,5 +33,5 @@
if (qos) {
fc = cpu_to_le16(IEEE80211_FTYPE_DATA |
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch
index c525ee3..94b0038 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch
@@ -1,4 +1,4 @@
-From b22d9da27623db1d7c3bf7f677afcdb99ec5ec27 Mon Sep 17 00:00:00 2001
+From 5ec53c93f1361412ff263a1bf8eb38c18e447d4a Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Wed, 31 Jan 2024 11:40:28 +0800
Subject: [PATCH 46/61] mtk: mac80211: remove link != 0 warn on in
@@ -38,5 +38,5 @@
rcu_read_unlock();
return;
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
index 3a4cb12..d79d929 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
@@ -1,4 +1,4 @@
-From 588692667ae3d8a198760c19d335d33b0dca6ba0 Mon Sep 17 00:00:00 2001
+From f5a7e57bca203a7d063faf0b9b54b4da8c42f884 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 1 Feb 2024 17:46:49 +0800
Subject: [PATCH 47/61] mtk: mac80211: fix radar required of link issue in
@@ -35,5 +35,5 @@
if (err) {
if (ieee80211_chanctx_refcount(local, new_ctx) == 0)
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
index 71dd590..f711fcd 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
@@ -1,4 +1,4 @@
-From d65bfb08d34fadb98ad271a91365004e8b674b84 Mon Sep 17 00:00:00 2001
+From 286c36e1252e070ae30be3231b1349edb8cb74b6 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 1 Feb 2024 10:57:39 +0800
Subject: [PATCH 48/61] mtk: cfg80211: rework cac started, cac start time for
@@ -151,10 +151,10 @@
}
}
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 083da12..cdeb787 100644
+index fce9834..be52a83 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -559,13 +559,21 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do
+@@ -563,13 +563,21 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do
wiphy_delayed_work_cancel(local->hw.wiphy,
&sdata->deflink.dfs_cac_timer_work);
@@ -384,5 +384,5 @@
if (!chandef || !chandef->chan ||
chandef->chan->band != NL80211_BAND_5GHZ)
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
index 29610d4..9bbab60 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
@@ -1,4 +1,4 @@
-From cf275081660642ebfc9aaef0722ac499922fb17b Mon Sep 17 00:00:00 2001
+From c1553f36bfb1b80be2306a50d98c0a2d256725b7 Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Tue, 6 Feb 2024 15:03:49 +0800
Subject: [PATCH 49/61] mtk: mac80211: remove links when removing AP_VLAN
@@ -42,13 +42,13 @@
ieee80211_vif_set_links(sdata, wdev->valid_links, 0);
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index cdeb787..83b579a 100644
+index be52a83..e41bf5c 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -393,8 +393,8 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
- sdata->vif.active_links = nsdata->vif.active_links;
- sdata->vif.dormant_links = nsdata->vif.dormant_links;
- for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) {
+@@ -397,8 +397,8 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
+ sdata->link[i] == &sdata->deflink)
+ continue;
+
- sdata->link[i] = nsdata->link[i];
- sdata->vif.link_conf[i] = nsdata->vif.link_conf[i];
+ rcu_assign_pointer(sdata->link[i], nsdata->link[i]);
@@ -88,5 +88,5 @@
* links are controlled by upper layers (userspace/cfg)
* only for AP mode, so only remove them here for AP
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
index 8d22bef..41f46d6 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
@@ -1,4 +1,4 @@
-From de8d3f6fa5fdebd105e1c7e99f635c94e7f37344 Mon Sep 17 00:00:00 2001
+From d90c8383297753b4d89012b6b5e5760e919b6503 Mon Sep 17 00:00:00 2001
From: Michael-CY Lee <michael-cy.lee@mediatek.com>
Date: Thu, 25 Jan 2024 14:07:23 +0800
Subject: [PATCH 50/61] mtk: mac80211: fix AP mgmt not encrypted in WDS mode
@@ -33,5 +33,5 @@
}
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch
index 8b65ac2..70677dd 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch
@@ -1,4 +1,4 @@
-From edef4ae672b3d124b573c1c9856d6435f30b6bb5 Mon Sep 17 00:00:00 2001
+From 53ca97bf26ea7ce77d2cf34b90349e08d2569326 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 15 Feb 2024 14:30:02 +0800
Subject: [PATCH 51/61] mtk: mac80211: fix ieee80211_ht_cap_ie_to_sta_ht_cap
@@ -29,5 +29,5 @@
elems->ht_cap_elem,
link_sta);
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch
index 4776c64..74531ef 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch
@@ -1,4 +1,4 @@
-From 9bd4c9f67e46919eff0f755bfe675a6ac5c1ac4e Mon Sep 17 00:00:00 2001
+From 93ef1345d2859a21daf239a6c931b16e46286d59 Mon Sep 17 00:00:00 2001
From: Peter Chiu <chui-hao.chiu@mediatek.com>
Date: Fri, 16 Feb 2024 17:38:22 +0800
Subject: [PATCH 52/61] mtk: mac80211: fix mac address to support hw path in
@@ -12,10 +12,10 @@
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 83b579a..026436e 100644
+index e41bf5c..b267b21 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -983,7 +983,10 @@ static int ieee80211_netdev_fill_forward_path(struct net_device_path_ctx *ctx,
+@@ -987,7 +987,10 @@ static int ieee80211_netdev_fill_forward_path(struct net_device_path_ctx *ctx,
}
}
@@ -28,5 +28,5 @@
default:
goto out;
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
index a930dad..40da0b4 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
@@ -1,4 +1,4 @@
-From e564e83652ae93e37f624eac45f98d3ee17cb811 Mon Sep 17 00:00:00 2001
+From 23f6000da41a1c393b3c2e85554e6c8da4d728a2 Mon Sep 17 00:00:00 2001
From: Allen Ye <allen.ye@mediatek.com>
Date: Thu, 22 Feb 2024 15:21:49 +0800
Subject: [PATCH 53/61] mtk: mac80211: workaround for configuring txpower in
@@ -100,7 +100,7 @@
static inline bool ieee80211_sdata_running(struct ieee80211_sub_if_data *sdata)
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 026436e..3400811 100644
+index b267b21..5070c24 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -44,13 +44,14 @@
@@ -160,5 +160,5 @@
return 0;
}
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
index 83313ad..26c07c3 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
@@ -1,4 +1,4 @@
-From 487ac10c66d16a0dd2ef526b7223cce87cbded40 Mon Sep 17 00:00:00 2001
+From 06d3d93fc257b9f8cef083b9b84711fc9c3cee19 Mon Sep 17 00:00:00 2001
From: Michael-CY Lee <michael-cy.lee@mediatek.com>
Date: Wed, 21 Feb 2024 16:32:13 +0800
Subject: [PATCH 54/61] mtk: mac80211: send broadcast/multicast mgmt. via all
@@ -44,5 +44,5 @@
goto out_unlock;
}
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
index e07e072..e210794 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
@@ -1,4 +1,4 @@
-From 6d5903a35436fb71f4a245f7b9ddd6279d640adc Mon Sep 17 00:00:00 2001
+From 3529be517dc9be0c911b06a1165ae80e3d051238 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Fri, 15 Mar 2024 14:34:11 +0800
Subject: [PATCH 55/61] mtk: mac80211: fix mlo BW 160 channel switch issue
@@ -27,5 +27,5 @@
if (changed) {
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
index 4081333..a3cdf5e 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
@@ -1,4 +1,4 @@
-From 67aa5809167470add6b82fb0049ce6d33327592e Mon Sep 17 00:00:00 2001
+From c2aed160872b89580f253fdfb2369e59951e3695 Mon Sep 17 00:00:00 2001
From: Michael-CY Lee <michael-cy.lee@mediatek.com>
Date: Thu, 21 Mar 2024 10:58:59 +0800
Subject: [PATCH 56/61] mtk: mac80211: extend IEEE80211_KEY_FLAG_GENERATE_MMIE
@@ -58,5 +58,5 @@
hdr = (struct ieee80211_hdr *)skb->data;
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch
index 70dcf67..16278ac 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch
@@ -1,4 +1,4 @@
-From 4bd23c637585903378fcd35828cd9d0e01d7d565 Mon Sep 17 00:00:00 2001
+From b311c85cdc3fe0a91d4b93628b6f559a2dfe3f5c Mon Sep 17 00:00:00 2001
From: Michael-CY Lee <michael-cy.lee@mediatek.com>
Date: Mon, 25 Mar 2024 18:59:35 +0800
Subject: [PATCH 57/61] mtk: wifi: mt76: mt7996: not to check 'need_offchan'
@@ -27,5 +27,5 @@
int i;
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
index 277cfd8..136ef38 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
@@ -1,4 +1,4 @@
-From 70e027ce4ac9e4de16829c88ee846b7e12f14953 Mon Sep 17 00:00:00 2001
+From db3b035491cb7be00b1ac169863a172a5aebbacf Mon Sep 17 00:00:00 2001
From: Michael-CY Lee <michael-cy.lee@mediatek.com>
Date: Mon, 25 Mar 2024 16:26:34 +0800
Subject: [PATCH 58/61] mtk: wifi: mt76: mt7996: assign link address to the
@@ -48,5 +48,5 @@
kfree_skb(skb);
} else {
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
index 59ae7ff..7d99fae 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
@@ -1,4 +1,4 @@
-From 0f6fde17638d83518432f95ef7b75f2ef883ff1e Mon Sep 17 00:00:00 2001
+From 26fc78265ac13821bb7d075be2859a1f5896f924 Mon Sep 17 00:00:00 2001
From: Michael-CY Lee <michael-cy.lee@mediatek.com>
Date: Tue, 26 Mar 2024 11:36:35 +0800
Subject: [PATCH 59/61] mtk: wifi: mt76: mt7996: Do MLD address translation
@@ -39,5 +39,5 @@
case IEEE80211_STYPE_BEACON:
ieee80211_rx_mgmt_beacon(link, (void *)mgmt,
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
index 038de8d..2dfd135 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
@@ -1,4 +1,4 @@
-From 5b90a58e50482689a246cfce127bc44ad05f79af Mon Sep 17 00:00:00 2001
+From cd576eae15b45ef97e3ee180482d2e884889fb09 Mon Sep 17 00:00:00 2001
From: Shayne Chen <shayne.chen@mediatek.com>
Date: Fri, 12 Apr 2024 11:45:41 +0800
Subject: [PATCH 60/61] mtk: wifi: mac80211: defer enabling beacon for MLD AP
@@ -40,5 +40,5 @@
if (ieee80211_num_beaconing_links(sdata) <= 1)
netif_carrier_on(dev);
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
index b805193..8e19d75 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
@@ -1,4 +1,4 @@
-From 250ed9ee9f5f7e422dd4d96c1ba328b517c55040 Mon Sep 17 00:00:00 2001
+From 017795da32681ed521917cf446ddacf5d33f649d Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Thu, 18 Apr 2024 18:08:48 +0800
Subject: [PATCH 61/61] mtk: wifi: mac80211: fix radar trigger issue due to
@@ -26,5 +26,5 @@
wiphy_delayed_work_cancel(local->hw.wiphy,
&link->dfs_cac_timer_work);
--
-2.39.2
+2.18.0
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0117-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0117-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
index 99ae028..8eb928e 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0117-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0117-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
@@ -1,4 +1,4 @@
-From c9185a2c4f8787a9ebb5acda6ceacaa79b3adad2 Mon Sep 17 00:00:00 2001
+From ac266f21b594867461f3354940b84d218992a42f Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Mon, 22 Apr 2024 16:49:48 +0800
Subject: [PATCH] mtk: wifi: mt76: mt7996: remain multiple wiphy model for
@@ -7,9 +7,9 @@
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
mt7996/init.c | 13 ++++++++-----
- mt7996/main.c | 8 ++++----
+ mt7996/main.c | 14 ++++++++++----
mt7996/mt7996.h | 9 ++++-----
- 3 files changed, 16 insertions(+), 14 deletions(-)
+ 3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/mt7996/init.c b/mt7996/init.c
index 047d2b78..3baf40d1 100644
@@ -43,7 +43,7 @@
#ifdef CONFIG_MTK_VENDOR
mt7996_unregister_csi(phy);
diff --git a/mt7996/main.c b/mt7996/main.c
-index 74b87475..9cdcc4a5 100644
+index 74b87475..ea230921 100644
--- a/mt7996/main.c
+++ b/mt7996/main.c
@@ -140,8 +140,8 @@ static int mt7996_start(struct ieee80211_hw *hw)
@@ -68,6 +68,19 @@
return;
cancel_delayed_work_sync(&dev->scs_work);
+@@ -453,6 +453,12 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,
+ is_zero_ether_addr(vif->addr))
+ phy->monitor_vif = vif;
+
++ if (dev->testmode_enable && vif->type != NL80211_IFTYPE_MONITOR) {
++ mutex_unlock(&dev->mt76.mutex);
++ dev_err(dev->mt76.dev, "Only monitor interface is allowed in testmode\n");
++ return -EINVAL;
++ }
++
+ INIT_DELAYED_WORK(&mvif->beacon_mon_work, mt7996_beacon_mon_work);
+ mvif->dev = dev;
+ mvif->hw = hw;
diff --git a/mt7996/mt7996.h b/mt7996/mt7996.h
index 9a9eb75b..5555c11c 100644
--- a/mt7996/mt7996.h
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
index 8fdc947..0ec893e 100755
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
@@ -71,7 +71,9 @@
rx_stbc \
tx_stbc \
he_bss_color \
- he_spr_non_srg_obss_pd_max_offset
+ he_spr_non_srg_obss_pd_max_offset \
+ pp_bitmap \
+ pp_mode
config_add_boolean \
ldpc \
greenfield \
@@ -588,6 +590,11 @@
esac
if [ "$enable_be" != "0" ]; then
+
+ json_get_vars \
+ pp_bitmap \
+ pp_mode
+
append base_cfg "ieee80211be=1" "$N"
if [ "$etxbfen" -eq 0 ]; then
append base_cfg "eht_su_beamformee=1" "$N"
@@ -609,6 +616,14 @@
;;
esac
}
+
+ if [ -n "$pp_bitmap" ]; then
+ append base_cfg "punct_bitmap=$pp_bitmap" "$N"
+ fi
+
+ if [ -n "$pp_mode" ]; then
+ append base_cfg "pp_mode=$pp_mode" "$N"
+ fi
fi
hostapd_prepare_device_config "$hostapd_conf_file" nl80211
@@ -654,7 +669,6 @@
cat >> /var/run/hostapd-$phy.conf <<EOF
$hostapd_cfg
bssid=$macaddr
-${default_macaddr:+#default_macaddr}
${dtim_period:+dtim_period=$dtim_period}
${max_listen_int:+max_listen_interval=$max_listen_int}
EOF
@@ -862,7 +876,6 @@
set_default powersave 0
json_add_string _ifname "$ifname"
- default_macaddr=
if [ "$mbssid" -gt 0 ] && [ "$mode" == "ap" ]; then
[ "$mbssidx" -eq 0 ] && {
if [ -z $macaddr ]; then
@@ -878,12 +891,10 @@
elif [ -z "$macaddr" ]; then
macaddr="$(mac80211_generate_mac $phy)"
macidx="$(($macidx + 1))"
- default_macaddr=1
elif [ "$macaddr" = 'random' ]; then
macaddr="$(macaddr_random)"
fi
json_add_string _macaddr "$macaddr"
- json_add_string _default_macaddr "$default_macaddr"
json_select ..
@@ -1007,7 +1018,7 @@
json_add_object "$ifname"
json_add_string mode adhoc
- [ -n "$default_macaddr" ] || json_add_string macaddr "$macaddr"
+ json_add_string macaddr "$macaddr"
json_add_string ssid "$ssid"
json_add_string freq "$freq"
json_add_string htmode "$iw_htmode"
@@ -1033,7 +1044,7 @@
json_add_object "$ifname"
json_add_string mode mesh
- [ -n "$default_macaddr" ] || json_add_string macaddr "$macaddr"
+ json_add_string macaddr "$macaddr"
json_add_string ssid "$ssid"
json_add_string freq "$freq"
json_add_string htmode "$iw_htmode"
@@ -1093,7 +1104,7 @@
json_add_string iface "$ifname"
json_add_string mode "$mode"
json_add_string config "$_config"
- [ -n "$default_macaddr" ] || json_add_string macaddr "$macaddr"
+ json_add_string macaddr "$macaddr"
[ -n "$network_bridge" ] && json_add_string bridge "$network_bridge"
[ -n "$wds" ] && json_add_boolean 4addr "$wds"
json_add_boolean powersave "$powersave"
@@ -1197,7 +1208,6 @@
json_select config
json_get_var ifname _ifname
json_get_var macaddr _macaddr
- json_get_var default_macaddr _default_macaddr
json_get_vars mode wds powersave
set_default powersave 0
@@ -1351,6 +1361,12 @@
staidx=0
mbssidx=0
+ if [ "$phy" = "phy1" ]; then
+ macidx=20;
+ elif [ "$phy" = "phy2" ]; then
+ macidx=40;
+ fi
+
[ -n "$chanbw" ] && {
for file in /sys/kernel/debug/ieee80211/$phy/ath9k*/chanbw /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode; do
[ -f "$file" ] && echo "$chanbw" > "$file"
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh
index aa3e5c8..d8a1756 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh
+++ b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh
@@ -194,6 +194,7 @@
detect_mac80211() {
devidx=0
+ disabled=0
config_load wireless
config_foreach check_devidx wifi-device
@@ -203,6 +204,10 @@
rand=$(hexdump -C /dev/urandom | head -n 1 &)
killall hexdump
+ if (dmesg | grep -q "WM_TM"); then
+ disabled=1
+ fi
+
for _dev in /sys/class/ieee80211/*; do
[ -e "$_dev" ] || continue
@@ -277,7 +282,7 @@
set wireless.${name}.htmode=$htmode
set wireless.${name}.country='US'
set wireless.${name}.noscan=${noscan}
- set wireless.${name}.disabled=0
+ set wireless.${name}.disabled=${disabled}
EOF
[ -n "$mbssid" ] && {
uci -q set wireless.${name}.mbssid=${mbssid}