diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
index ff7bf13..cf10b5b 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
@@ -1,4 +1,4 @@
-From e08312372ea37fb5b779b0033398c42cb964d60b Mon Sep 17 00:00:00 2001
+From 22202726453e5648e92ec4bb0168076fac9e79c7 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Tue, 18 Jan 2022 20:29:44 +0800
 Subject: [PATCH 01/17] mac80211: mtk: do not setup twt when twt responder is
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
index d3f3c25..e281cdd 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-nl80211-mtk-extend-CAC-time-for-weather-radar-channe.patch
@@ -1,4 +1,4 @@
-From 2492089abe056e307bab235b7495d83e1b0147c8 Mon Sep 17 00:00:00 2001
+From 90338d1909357f0fac0ec1f0ead5f4a9b47524b9 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Tue, 29 Mar 2022 16:06:30 +0800
 Subject: [PATCH 02/17] nl80211: mtk: extend CAC time for weather radar
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
index 3d4c751..320b2ad 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
@@ -1,4 +1,4 @@
-From 51210b7536e16832597d65afa2566fb8c2ebc6a8 Mon Sep 17 00:00:00 2001
+From 3752aaaf5c78368fb0f8e7e567782d4ec55a4a14 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Fri, 1 Apr 2022 09:15:21 +0800
 Subject: [PATCH 03/17] mac80211: mtk: it's invalid case when frag_threshold is
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
index a15cce8..d4bdd51 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
@@ -1,4 +1,4 @@
-From 9ba15de3875a394284c6e22f4fab53f97bdcd036 Mon Sep 17 00:00:00 2001
+From 86cc94d1060840b23fc5ca362b72917cd8541a2e Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
 Date: Mon, 7 Mar 2022 15:18:00 +0800
 Subject: [PATCH 04/17] mac80211: mtk: correct legacy rates check in
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
index a17f4fb..d804171 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
@@ -1,4 +1,4 @@
-From 7614f2f53f29107bfcbe35eb492b33e3cf5a3424 Mon Sep 17 00:00:00 2001
+From ab517887ba2464c9b27c600cd2930a539a791c2a Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Wed, 19 Oct 2022 13:42:43 +0800
 Subject: [PATCH 05/17] mac80211: mtk: airtime_flags depends on
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
index 367e606..9e5b682 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
@@ -1,4 +1,4 @@
-From a8394d1022b18e19af8e8dc316a958b40d1b8738 Mon Sep 17 00:00:00 2001
+From 8f8598d2e6a82a2a1d43e8e86a8d43e185cd1807 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Wed, 19 Oct 2022 13:45:42 +0800
 Subject: [PATCH 06/17] mac80211: mtk: add support for runtime set inband
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
index 8715e58..647b3f5 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
@@ -1,4 +1,4 @@
-From ce107f39d1045ec67d1b099e3854c2d1d96e0d39 Mon Sep 17 00:00:00 2001
+From c45c2ccc4c042e5430d43ce4b6bf2b70d7d8f514 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Wed, 8 Jun 2022 10:26:39 +0800
 Subject: [PATCH 07/17] mac80211: mtk: add s1g category to
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
index 8583c20..37de852 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
@@ -1,4 +1,4 @@
-From fe2ad6597b691227238937826f438ca747b1ca69 Mon Sep 17 00:00:00 2001
+From a8adfd3802d6dfa399405e1768aed02d53aac53a Mon Sep 17 00:00:00 2001
 From: Lian Chen <lian.chen@mediatek.com>
 Date: Thu, 14 Jul 2022 16:33:58 +0800
 Subject: [PATCH 08/17] mac80211: mtk: make 4addr null frames using min_rate
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
index bb7e1c8..5d3bf21 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
@@ -1,4 +1,4 @@
-From d709fced0f76880082360dd0b264ca96eb0134a2 Mon Sep 17 00:00:00 2001
+From cce15ccadd8a06d42a3ed73c89f2b495ff65e5de Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 22 Sep 2022 14:27:41 +0800
 Subject: [PATCH 09/17] cfg80211: mtk: implement DFS status show, cac and nop
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
index 3fede94..c859a0d 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
@@ -1,4 +1,4 @@
-From 5dfa389b6b538b4bc909e1661a61c7e6b76c2fd1 Mon Sep 17 00:00:00 2001
+From 3bd97531ce8c3828b0ae570b11668e4c227bb940 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 4 Oct 2022 10:47:05 +0800
 Subject: [PATCH 10/17] mac80211: mtk: Set TWT Information Frame Disabled bit
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
index 8de5204..0783ea5 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
@@ -1,4 +1,4 @@
-From 39a159513845a4a12fe5a28e7474d2be687e82d8 Mon Sep 17 00:00:00 2001
+From ab3728fbce6284929abae90db4d2227a1c9fc3b0 Mon Sep 17 00:00:00 2001
 From: mtk31095 <michael-cy.lee@mediatek.com>
 Date: Fri, 16 Dec 2022 10:37:53 +0800
 Subject: [PATCH 11/17] mac80211: mtk: check the control channel before
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
index 85a5cb3..57c5d93 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
@@ -1,4 +1,4 @@
-From ef1101d26b31e4381de1c85fc9486266a1a956d1 Mon Sep 17 00:00:00 2001
+From 21dcc00df24dc33301a3ad9749ddcb9f3b9d6d47 Mon Sep 17 00:00:00 2001
 From: TomLiu <tomml.liu@mediatek.com>
 Date: Wed, 14 Dec 2022 00:26:50 -0800
 Subject: [PATCH 12/17] mac80211: mtk: fix tx amsdu aggregation
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
index ff0916c..c0bd42f 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
@@ -1,4 +1,4 @@
-From 7dbdea8fa2a80041222847c878dfdd6fbb57edc1 Mon Sep 17 00:00:00 2001
+From 49f5a07866ca6a6be26cec9886e702d54308a78c Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Mon, 20 Feb 2023 14:25:24 +0800
 Subject: [PATCH 13/17] mac80211: mtk: add sta-assisted DFS state update
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
index 510400a..a737760 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
@@ -1,4 +1,4 @@
-From 9e2ae5752daf557e15fbc42bcd1aede452f56653 Mon Sep 17 00:00:00 2001
+From 733a9401bcdc8b01fc7b914599da04d847d50417 Mon Sep 17 00:00:00 2001
 From: "himanshu.goyal" <himanshu.goyal@mediatek.com>
 Date: Fri, 17 Mar 2023 17:36:01 +0800
 Subject: [PATCH 14/17] nl80211: mtk: Mark DFS channel as available for CSA.
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
index bdd1810..18f7508 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
@@ -1,4 +1,4 @@
-From eb61cbefd3be0bfbca2adfc62128c1865a986cab Mon Sep 17 00:00:00 2001
+From 522654071f8ec8ae69eef5a9bac27f8e6b3f7597 Mon Sep 17 00:00:00 2001
 From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
 Date: Wed, 8 Mar 2023 06:23:55 +0800
 Subject: [PATCH 15/17] mac80211: mtk: track obss color bitmap
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
index f01727b..06d6d8b 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
@@ -1,4 +1,4 @@
-From 33868146e22367474bc6de629c2011a199d209f1 Mon Sep 17 00:00:00 2001
+From 61d499cf2de7201642cd7175b5c067b1e17309c2 Mon Sep 17 00:00:00 2001
 From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
 Date: Wed, 8 Mar 2023 06:32:42 +0800
 Subject: [PATCH 16/17] mac80211: mtk: ageout color bitmap
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
index 6a7d8d2..85a3320 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
@@ -1,4 +1,4 @@
-From bc76aa1d770aad3db7b64394606c63e953e11f4b Mon Sep 17 00:00:00 2001
+From 52bbeb36a98ea83762908b19b3ba3ba3bf3eeb07 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Fri, 14 Apr 2023 06:55:22 +0800
 Subject: [PATCH 17/17] mac80211: mtk: update max_bssid_indicator based on real
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
index 34b65c4..7495c0b 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
@@ -1,4 +1,4 @@
-From 2aa50f34a5e8378775028818a1e6f285498fd01e Mon Sep 17 00:00:00 2001
+From 02d5d2c957efe75c9bd6a57c2644082c3b3e4e49 Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Fri, 11 Mar 2022 11:34:11 +0800
 Subject: [PATCH 9900/9902] mac80211: mtk: mask kernel version limitation and
@@ -6,12 +6,11 @@
 
 Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
 ---
- include/net/mac80211.h      |  2 --
- include/net/mac80211.h.orig | 43 +++++++++++++++++++++++++++++++++++--
- net/mac80211/driver-ops.h   |  2 --
- net/mac80211/iface.c        |  4 ----
- net/mac80211/trace.h        |  2 --
- 5 files changed, 41 insertions(+), 12 deletions(-)
+ include/net/mac80211.h    | 2 --
+ net/mac80211/driver-ops.h | 2 --
+ net/mac80211/iface.c      | 4 ----
+ net/mac80211/trace.h      | 2 --
+ 4 files changed, 10 deletions(-)
 
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
 index 28ec7e8..9c35e0b 100644
@@ -31,151 +30,6 @@
  };
  
  /**
-diff --git a/include/net/mac80211.h.orig b/include/net/mac80211.h.orig
-index dba8550..28ec7e8 100644
---- a/include/net/mac80211.h.orig
-+++ b/include/net/mac80211.h.orig
-@@ -505,6 +505,7 @@ struct ieee80211_ftm_responder_params {
- struct ieee80211_fils_discovery {
- 	u32 min_interval;
- 	u32 max_interval;
-+	u8 disable;
- };
- 
- /**
-@@ -698,6 +699,8 @@ struct ieee80211_bss_conf {
- 	} he_oper;
- 	struct ieee80211_he_obss_pd he_obss_pd;
- 	struct cfg80211_he_bss_color he_bss_color;
-+	u64 used_color_bitmap;
-+	u64 color_last_seen[64];
- 	struct ieee80211_fils_discovery fils_discovery;
- 	u32 unsol_bcast_probe_resp_interval;
- 	bool s1g;
-@@ -1566,6 +1569,7 @@ enum ieee80211_smps_mode {
-  *
-  * @power_level: requested transmit power (in dBm), backward compatibility
-  *	value only that is set to the minimum of all interfaces
-+ * @max_antenna_gain: maximum antenna gain adjusted by user config (in dBi)
-  *
-  * @chandef: the channel definition to tune to
-  * @radar_enabled: whether radar detection is enabled
-@@ -1586,6 +1590,7 @@ enum ieee80211_smps_mode {
- struct ieee80211_conf {
- 	u32 flags;
- 	int power_level, dynamic_ps_timeout;
-+	int max_antenna_gain;
- 
- 	u16 listen_interval;
- 	u8 ps_dtim_period;
-@@ -1685,6 +1690,10 @@ enum ieee80211_offload_flags {
-  *	write-protected by sdata_lock and local->mtx so holding either is fine
-  *	for read access.
-  * @mu_mimo_owner: indicates interface owns MU-MIMO capability
-+ * @netdev_features: tx netdev features supported by the hardware for this
-+ *	vif. mac80211 initializes this to hw->netdev_features, and the driver
-+ *	can mask out specific tx features. mac80211 will handle software fixup
-+ *	for masked offloads (GSO, CSUM)
-  * @driver_flags: flags/capabilities the driver has for this interface,
-  *	these need to be set (or cleared) when the interface is added
-  *	or, if supported by the driver, the interface type is changed
-@@ -1736,6 +1745,7 @@ struct ieee80211_vif {
- 
- 	struct ieee80211_chanctx_conf __rcu *chanctx_conf;
- 
-+	netdev_features_t netdev_features;
- 	u32 driver_flags;
- 	u32 offload_flags;
- 
-@@ -2418,6 +2428,9 @@ struct ieee80211_txq {
-  *	usage and 802.11 frames with %RX_FLAG_ONLY_MONITOR set for monitor to
-  *	the stack.
-  *
-+ * @IEEE80211_HW_DETECTS_COLOR_COLLISION: HW/driver has support for BSS color
-+ *	collision detection and doesn't need it in software.
-+ *
-  * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
-  */
- enum ieee80211_hw_flags {
-@@ -2473,6 +2486,7 @@ enum ieee80211_hw_flags {
- 	IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD,
- 	IEEE80211_HW_SUPPORTS_RX_DECAP_OFFLOAD,
- 	IEEE80211_HW_SUPPORTS_CONC_MON_RX_DECAP,
-+	IEEE80211_HW_DETECTS_COLOR_COLLISION,
- 
- 	/* keep last, obviously */
- 	NUM_IEEE80211_HW_FLAGS
-@@ -2656,6 +2670,13 @@ static inline void _ieee80211_hw_set(struct ieee80211_hw *hw,
- }
- #define ieee80211_hw_set(hw, flg)	_ieee80211_hw_set(hw, IEEE80211_HW_##flg)
- 
-+static inline void _ieee80211_hw_clear(struct ieee80211_hw *hw,
-+				     enum ieee80211_hw_flags flg)
-+{
-+	return __clear_bit(flg, hw->flags);
-+}
-+#define ieee80211_hw_clear(hw, flg)	_ieee80211_hw_clear(hw, IEEE80211_HW_##flg)
-+
- /**
-  * struct ieee80211_scan_request - hw scan request
-  *
-@@ -3688,6 +3709,10 @@ struct ieee80211_prep_tx_info {
-  *	Note that vif can be NULL.
-  *	The callback can sleep.
-  *
-+ * @flush_sta: Flush or drop all pending frames from the hardware queue(s) for
-+ *	the given station, as it's about to be removed.
-+ *	The callback can sleep.
-+ *
-  * @channel_switch: Drivers that need (or want) to offload the channel
-  *	switch operation for CSAs received from the AP may implement this
-  *	callback. They must then call ieee80211_chswitch_done() to indicate
-@@ -4116,6 +4141,8 @@ struct ieee80211_ops {
- #endif
- 	void (*flush)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
- 		      u32 queues, bool drop);
-+	void (*flush_sta)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-+			  struct ieee80211_sta *sta);
- 	void (*channel_switch)(struct ieee80211_hw *hw,
- 			       struct ieee80211_vif *vif,
- 			       struct ieee80211_channel_switch *ch_switch);
-@@ -5677,6 +5704,18 @@ void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
- 				  struct delayed_work *dwork,
- 				  unsigned long delay);
- 
-+/**
-+ * ieee80211_refresh_tx_agg_session_timer - Refresh a tx agg session timer.
-+ * @sta: the station for which to start a BA session
-+ * @tid: the TID to BA on.
-+ *
-+ * This function allows low level driver to refresh tx agg session timer
-+ * to maintain BA session, the session level will still be managed by the
-+ * mac80211.
-+ */
-+void ieee80211_refresh_tx_agg_session_timer(struct ieee80211_sta *sta,
-+					    u16 tid);
-+
- /**
-  * ieee80211_start_tx_ba_session - Start a tx Block Ack session.
-  * @sta: the station for which to start a BA session
-@@ -6844,7 +6883,7 @@ ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
- 					  struct ieee80211_vif *vif);
- 
- /**
-- * ieeee80211_obss_color_collision_notify - notify userland about a BSS color
-+ * ieee80211_obss_color_collision_notify - notify userland about a BSS color
-  * collision.
-  *
-  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
-@@ -6852,7 +6891,7 @@ ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
-  *	aware of.
-  */
- void
--ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
-+ieee80211_obss_color_collision_notify(struct ieee80211_vif *vif,
- 				       u64 color_bitmap);
- 
- /**
 diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
 index 9e8003f..19e2ada 100644
 --- a/net/mac80211/driver-ops.h
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
index 89c69af..a9d2762 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
@@ -1,4 +1,4 @@
-From ab3989fe1cbdd9ed29f9f3a44469a489514b65cf Mon Sep 17 00:00:00 2001
+From c99c0ad9d8ec47c1a24cbe500cc016be9aa1cbe3 Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Wed, 18 May 2022 15:10:22 +0800
 Subject: [PATCH 9901/9902] mac80211: mtk: add fill receive path ops to get wed
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
index 847ab53..eebb33f 100644
--- a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
+++ b/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
@@ -1,4 +1,4 @@
-From 969c0b5bc134dcd4eb3d02ee01845c6dfc1445f1 Mon Sep 17 00:00:00 2001
+From 6132995c725ee7856c3fa1bd0415a10b56664c8e Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Tue, 28 Mar 2023 10:53:31 +0800
 Subject: [PATCH 9902/9902] mac80211: mtk: add support for letting drivers