[rdkb][common][bsp][Refactor and sync wifi from openwrt]
[Description]
387b6ecf [MAC80211][WiFi6][core][Add exported function for SoftMAC driver to get QoS map]
4e3cb5c0 [MAC80211][Rebase Patch][Fix inconsistent QoS mapping between SW and HW]
03f284d9 [MAC80211][WiFi6][mt76][Fix inconsistent QoS mapping between SW and HW]
cdd2ea74 [MAC80211][WiFi6][mt76][Fix rcu stall issue in testmode]
8f684af1 [MAC80211][Release][Add commit revision for Filogic 880/860 release]
bf9808d3 [MAC80211][WiFi6][mt76][Refactor add dummy HW offload of IEEE 802.11 fragmentation]
00b8ee9c [MAC80211][misc][Update Release Information v2]
efcc36f2 [MAC80211][misc][Update Release Information]
8249196d [MAC80211][WiFi7][misc][Add UCI radio disabled for testmode]
[Release-log]
Change-Id: I0e39f84703dc98e6f25cf7d59e98729d33cc6f12
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
index 5b1cb2a..be103d3 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
@@ -8,9 +8,7 @@
Refactor DFS debugfs command for MLO
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: I5e50523684bdc5086a18d36177e0d81530ba0e3f
---
include/net/cfg80211.h | 1 +
net/mac80211/cfg.c | 25 +++
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch
index 4671638..6aaf0f5 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch
@@ -4,7 +4,6 @@
Subject: [PATCH 13/61] mtk: mac80211: check the control channel before
downgrading the bandwidth
-Change-Id: I25f0495818194a18e4acf23d6c45393f12e32080
---
net/mac80211/mlme.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
index d02a2c0..1521470 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
@@ -4,7 +4,6 @@
Subject: [PATCH 15/61] mtk: mac80211: add fill receive path ops to get wed idx
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
-Change-Id: Ib3dbf4a1d960e4b0aad3ebdb1327912ae087f877
---
include/net/mac80211.h | 5 +++++
net/mac80211/driver-ops.h | 13 +++++++++++++
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch
index dbbfb55..01c513d 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch
@@ -9,7 +9,6 @@
echo 1 > /sys/kernel/debug/tracing/events/mac80211/bss_color_bitmap/enable
echo 1 > /sys/kernel/debug/tracing/events/mac80211/bss_color_collision/enable
-Change-Id: I24ebcc3181c05476b41107ce8fe7f3d4c8907e81
---
include/net/mac80211.h | 1 +
net/mac80211/rx.c | 6 +++++-
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
index 31e8a28..b764033 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
@@ -6,8 +6,6 @@
Fix max_bssid_indicator get empty value due to wrong pointer.
-CR-Id: WCNCR00259302
-Change-Id: I2a9bcd96e9432569a9968ba9e519c55ebe13cdfe
---
net/mac80211/cfg.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
index 244689c..aa94d8f 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
@@ -5,7 +5,6 @@
mechanism
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: Ida821ebb42825cd1895eaccfbbfda1106e598009
---
include/net/cfg80211.h | 14 +++++++++
include/uapi/linux/nl80211.h | 6 ++++
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
index edfa07a..6a68e82 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
@@ -5,7 +5,6 @@
use_chanctx is false
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: I2876d763ed1ecb5b7c7e5c53b2623dcd34ece774
---
net/mac80211/chan.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
index 081bd72..cdc396e 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
@@ -4,7 +4,6 @@
Subject: [PATCH 33/61] mtk: mac80211: add per-bss flag to support vendors
counter
-Change-Id: I73fcae64d933c66b9eef9b6f55f7bb1e4ce19501
---
include/uapi/linux/nl80211.h | 1 +
net/mac80211/rx.c | 8 ++++++--
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
index 9faae94..ecdc233 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
@@ -4,8 +4,6 @@
Subject: [PATCH 34/61] mtk: mac80211: set eht_support to false when AP is not
in EHT mode
-CR-ID: WCNCR00240597
-Change-Id: I826428e26ba70a0e77fcc8c9bc0dca440060e880
Signed-off-by: MeiChia Chiu <meichia.chiu@mediatek.com>
---
net/mac80211/cfg.c | 1 +
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
index 50e53f9..9d76079 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
@@ -6,13 +6,10 @@
Add a switch of certification mode in debugfs as cert_mode. In the case
we use it to disable BA timeout from STA to prevent crashing STA.
-CR-Id: WCNCR00259302
-Change-Id: I537715030d2eeae3c795725093c79c4878086f1a
Signed-off-by: Allen.Ye <allen.ye@mediatek.com>
Move the variable 'cert_mode' from ieee80211_local to ieee80211_hw
-CR-Id: WCNCR00289305
Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
---
include/net/mac80211.h | 6 ++++++
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch
index 95fac53..01f9aaf 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch
@@ -7,9 +7,7 @@
Kernel v5.4.260 has added this API, so update kernel version check in
backports include.
-CR-Id: WCNCR00238098
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
-Change-Id: I708aabbe51de9d480932ce03b30d004bf1d67ebd
---
backport-include/linux/etherdevice.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
index 88560ce..806bfd5 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
@@ -22,9 +22,7 @@
Mac80211 scan state will be set in scanning, and will be reset after
scan done and before restore to duty channel.
-CR-Id: WCNCR00357653
Signed-off-by: fancy.liu <fancy.liu@mediatek.com>
-Change-Id: I480a956c8a362929040d941247d74ff0e5d06ffb
---
include/net/mac80211.h | 7 +++++++
net/mac80211/util.c | 9 +++++++++
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
index f958799..93a9f79 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
@@ -7,9 +7,7 @@
Due to 6G band doesn't have HT cap, we change cap check into each action
frame section.
-CR-Id: WCNCR00259302
Signed-off-by: Allen.Ye <allen.ye@mediatek.com>
-Change-Id: I65d2cc29efdb4a78ac670890842496a2056fc2ba
---
net/mac80211/rx.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch
index 4c56b5c..2161fef 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch
@@ -4,7 +4,6 @@
Subject: [PATCH 39/61] mtk: mac80211: allow multiple links for STA vif
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
-Change-Id: I92d07be6ec87523ef3fdc3855151daea382eb290
---
net/mac80211/link.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch
index ff69c5a..eb85ebc 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch
@@ -7,7 +7,6 @@
hanlding the request.
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
-Change-Id: I5ea21682b2498c73acc88095a665db1a3f7e7302
---
net/mac80211/mlme.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch
index 7427cc3..aa1b7ae 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch
@@ -4,7 +4,6 @@
Subject: [PATCH 41/61] mtk: mac80211: fix crash when starting tx ba session
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
-Change-Id: I62a463f9a37b25d4a2bfaff00e721c369e532e98
---
net/mac80211/agg-tx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch
index 09b76a0..f223bff 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch
@@ -5,7 +5,6 @@
ieee80211_tx_control_port()
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
-Change-Id: I67453fa4299a25a921a971cd5a2b7098844c5b8d
---
net/mac80211/tx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch
index 6ad3b95..b2a7cbf 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch
@@ -11,15 +11,11 @@
channel switch will use it, so wait until channel switch is completed.
(b) ieee80211_dfs_cac_cancel, ieee80211_dfs_radar_detected_work, ...
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: Ic3004607081ae407dd05095769f9e2855a068dd2
rework radar detected flow for mlo
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: I1c76d0b12db52fdb14e73c410d7da69de65bf115
---
include/net/cfg80211.h | 4 +++-
net/mac80211/cfg.c | 26 +++++++++++++++++++-------
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
index a82a203..52e91c0 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -8,14 +8,12 @@
2. Copy link information to AP_VLAN interface.
3. Fill 4addr nullfunc by mld address.
-CR-Id: WCNCR00240772
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
-Change-Id: I620bb51e47965c2558751ae266609dad61d421b6
---
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
@@ -43,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;
@@ -70,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];
+ }
@@ -121,5 +123,5 @@
if (!assoc_data)
return -ENOMEM;
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
index 7f3eef0..1bb036d 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
@@ -1,12 +1,10 @@
-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
Only get chanctx for non-mld VIF.
-CR-Id: WCNCR00238098
-Change-Id: I0a6861fc16d11e97fb29b775d5e641925b7dd92f
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
---
net/mac80211/cfg.c | 10 ++++++----
@@ -35,5 +33,5 @@
if (qos) {
fc = cpu_to_le16(IEEE80211_FTYPE_DATA |
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch
index 745751b..94b0038 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -6,7 +6,6 @@
Remove link warning for mlo channel switch
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
net/mac80211/rate.c | 10 ++++++++--
@@ -39,5 +38,5 @@
rcu_read_unlock();
return;
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
index d3324ff..d79d929 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -9,9 +9,7 @@
This will lead to DFS RDD init incomplete (RDD_CAC_START, RDD_CAC_END &
RDD_DET_MODE is not set to fw)
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: I44eeb32be5ff42202639f94418d079930369fde9
---
net/mac80211/chan.c | 2 ++
1 file changed, 2 insertions(+)
@@ -37,5 +35,5 @@
if (err) {
if (ieee80211_chanctx_refcount(local, new_ctx) == 0)
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
index eb3bca0..f711fcd 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
@@ -1,12 +1,10 @@
-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
multi-link support
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: Ib47630f1a01fd0d4bf7edb1964b2907f2b4ec8f3
---
include/net/cfg80211.h | 20 ++++++++++++++------
net/mac80211/cfg.c | 26 +++++++++++++-------------
@@ -153,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);
@@ -386,5 +384,5 @@
if (!chandef || !chandef->chan ||
chandef->chan->band != NL80211_BAND_5GHZ)
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
index d6fd5f4..9bbab60 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -8,9 +8,7 @@
Without this patch, there would be a kernel crash when station disconnect
from AP.
-CR-Id: WCNCR00240772
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
-Change-Id: Idffdc83cd6a13bc01b7f877fb748a8a08e99c212
---
net/mac80211/cfg.c | 14 ++++++++++++++
net/mac80211/iface.c | 4 ++--
@@ -44,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]);
@@ -90,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/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
index 25fbe6c..41f46d6 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -9,8 +9,6 @@
if called to find sta from AP_VLAN, and then interface type & 4-addr
using is checked.
-Change-Id: Ie94fbb22ca2cf7a96d94897e74314b5c61153380
-CR-Id: WCNCR00289305
Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
---
net/mac80211/tx.c | 7 +++++++
@@ -35,5 +33,5 @@
}
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch
index e31009b..70677dd 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -9,9 +9,7 @@
Therefore, 6G link will enter ieee80211_ht_cap_ie_to_sta_ht_cap, as elems->ht_cap_elem of 2/5G is NOT NULL.
This should be avoided; otherwise, if 6G is bw 320, then the warning will be triggered.
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
-Change-Id: I3be945036afe677a54e328685fd2fe7b725c6ed5
---
net/mac80211/mlme.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
@@ -31,5 +29,5 @@
elems->ht_cap_elem,
link_sta);
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch
index ffba153..74531ef 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -6,18 +6,16 @@
Use AP's MLD address instead of using deflink.
-CR-Id: WCNCR00240772
Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
-Change-Id: I6df2419d165406ef9b31ccb19600685d121e6d56
---
net/mac80211/iface.c | 5 ++++-
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,
}
}
@@ -30,5 +28,5 @@
default:
goto out;
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
index 3318c20..40da0b4 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -12,7 +12,6 @@
Apply the patch will make uci and iw set txpower commamd only effect
the link which id is 0 when we enable mld AP.
-CR-Id: WCNCR00259302
---
net/mac80211/cfg.c | 15 ++++++++++++---
net/mac80211/chan.c | 4 ++--
@@ -101,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 @@
@@ -161,5 +160,5 @@
return 0;
}
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
index 35c82f2..26c07c3 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -6,7 +6,6 @@
This patch makes broadcast/multicast mgmt. be sent via all links.
-CR-Id: WCNCR00289305
Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
Change-id: Id1bd06694a73cc29b3f571a57c4c864ee3742441
---
@@ -45,5 +44,5 @@
goto out_unlock;
}
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
index cd79879..e210794 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -8,7 +8,6 @@
The original commit has link_id instead of 0
https://patchwork.kernel.org/project/linux-wireless/list/?series=821321&state=*
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
net/mac80211/cfg.c | 2 +-
@@ -28,5 +27,5 @@
if (changed) {
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
index 3a2ff85..a3cdf5e 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -8,9 +8,7 @@
CMAC-256 and GMAC for the same reason that this flag was added.
(a0b449: mac80211: add IEEE80211_KEY_FLAG_GENERATE_MMIE to ieee80211_key_flags)
-CR-Id: WCNCR00289305
Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
-Change-Id: I0ce5f8894de42a42e257ffce75c51399a440f003
---
net/mac80211/wpa.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
@@ -60,5 +58,5 @@
hdr = (struct ieee80211_hdr *)skb->data;
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch
index 1995700..16278ac 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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'
@@ -7,9 +7,7 @@
Multicast mgmt. sent by the MLD AP should be transmitted via all links,
so it is not necessary to check 'need_offchan'.
-CR-Id: WCNCR00289305
Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
-Change-Id: I850d337ea98456b8d81fd767ceea1727333aa6ca
---
net/mac80211/offchannel.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
@@ -29,5 +27,5 @@
int i;
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
index eb8db1a..136ef38 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -8,9 +8,7 @@
This commit assigns link address to the header of cloned broadcast mgmt.
for the correct AAD calculation.
-CR-Id: WCNCR00289305
Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
-Change-Id: Ieeee17cc2121fdbc9eb34f171f2d4da583d91154
---
net/mac80211/offchannel.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
@@ -50,5 +48,5 @@
kfree_skb(skb);
} else {
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
index 2a098b4..7d99fae 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -13,9 +13,7 @@
This commit does MLD address translation again after the AAD calculation
and before STA's mgmt. frames processing.
-CR-Id: WCNCR00289305
Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
-Change-Id: I2a96ced315780b09f0cfc142f0f09b5f4a9a7312
---
net/mac80211/mlme.c | 9 +++++++++
1 file changed, 9 insertions(+)
@@ -41,5 +39,5 @@
case IEEE80211_STYPE_BEACON:
ieee80211_rx_mgmt_beacon(link, (void *)mgmt,
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
index a3ead0e..2dfd135 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -9,9 +9,7 @@
This is used to make sure that MLD AP start beacon after all links
finish settings.
-CR-Id: WCNCR00238098
Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
-Change-Id: Id2a4137b9101bae3777037f8d26b0380bfe1da48
---
net/mac80211/cfg.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
@@ -42,5 +40,5 @@
if (ieee80211_num_beaconing_links(sdata) <= 1)
netif_carrier_on(dev);
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch b/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
index 6673cb6..8e19d75 100644
--- a/recipes-wifi/linux-mac80211/files/patches-6.x/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
+++ b/recipes-wifi/linux-mac80211/files/patches-6.x/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
@@ -7,7 +7,6 @@
Since we change to single wiphy, we cannot directly return during cac cancel if the link conf in local->interfaces list is not for 5G band.
local->interfaces might contain 2/5/6G sdata
-CR-Id: WCNCR00274293
Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
---
net/mac80211/util.c | 2 +-
@@ -27,5 +26,5 @@
wiphy_delayed_work_cancel(local->hw.wiphy,
&link->dfs_cac_timer_work);
--
-2.39.2
+2.18.0
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/mtk-0031-mac80211-mtk-add-exported-function-for-SoftMAC-drive.patch b/recipes-wifi/linux-mac80211/files/patches/subsys/mtk-0031-mac80211-mtk-add-exported-function-for-SoftMAC-drive.patch
new file mode 100644
index 0000000..a26fc33
--- /dev/null
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/mtk-0031-mac80211-mtk-add-exported-function-for-SoftMAC-drive.patch
@@ -0,0 +1,58 @@
+From ac1e8443a250f418b6124e7b4f4ea65a03c4d02b Mon Sep 17 00:00:00 2001
+From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
+Date: Fri, 26 Apr 2024 09:29:39 +0800
+Subject: [PATCH] mac80211: mtk: add exported function for SoftMAC driver to
+ get QoS map
+
+The mapping from IP DSCP to IEEE 802.11 user priority may be customized.
+Therefore, driver needs to pass the mapping to HW, so that the QoS type of traffic can be mapped in a consistent manner for both SW and HW paths.
+
+Signed-off-by: Benjamin Lin <benjamin-jw.lin@mediatek.com>
+---
+ include/net/mac80211.h | 12 ++++++++++++
+ net/mac80211/util.c | 10 +++++++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/include/net/mac80211.h b/include/net/mac80211.h
+index 5c26752..420963f 100644
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -6942,4 +6942,16 @@ static inline bool ieee80211_is_tx_data(struct sk_buff *skb)
+ * @hw: pointer as obtained from ieee80211_alloc_hw()
+ */
+ unsigned long ieee80211_get_scanning(struct ieee80211_hw *hw);
++
++/**
++ * ieee80211_get_qos_map - get QoS mapping information.
++ *
++ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
++ *
++ * Return: Pointer to the QoS mapping information.
++ *
++ * Note that the return value is an RCU-protected pointer, so rcu_read_lock()
++ * must be held when calling this function.
++ */
++struct cfg80211_qos_map *ieee80211_get_qos_map(struct ieee80211_vif *vif);
+ #endif /* MAC80211_H */
+diff --git a/net/mac80211/util.c b/net/mac80211/util.c
+index e07fe73..865c4ac 100644
+--- a/net/mac80211/util.c
++++ b/net/mac80211/util.c
+@@ -4643,4 +4643,12 @@ unsigned long ieee80211_get_scanning(struct ieee80211_hw *hw)
+
+ return local->scanning;
+ }
+-EXPORT_SYMBOL(ieee80211_get_scanning);
+\ No newline at end of file
++EXPORT_SYMBOL(ieee80211_get_scanning);
++
++struct cfg80211_qos_map *ieee80211_get_qos_map(struct ieee80211_vif *vif)
++{
++ struct mac80211_qos_map *qos_map = rcu_dereference(vif_to_sdata(vif)->qos_map);
++
++ return qos_map ? &qos_map->qos_map : NULL;
++}
++EXPORT_SYMBOL(ieee80211_get_qos_map);
+--
+2.18.0
+
diff --git a/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc b/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
index f61f662..a12060b 100644
--- a/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
+++ b/recipes-wifi/linux-mac80211/files/patches/subsys/subsys.inc
@@ -88,6 +88,7 @@
file://mtk-0028-mac80211-mtk-backport-refactor-STA-CSA-paring-flow.patch \
file://mtk-0029-mac80211-mtk-send-4-addr-nullfunc-after-drv_event_ca.patch \
file://mtk-0030-mac80211-mtk-fix-incorrect-VIF-assignment-for-IEEE-8.patch \
+ file://mtk-0031-mac80211-mtk-add-exported-function-for-SoftMAC-drive.patch \
file://mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch \
file://mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch \
file://mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch \