[][MAC80211][misc][Fix mt7986 build fail on backport v6.1]

[Description]
Fix mt7986 build fail on backport v6.1
Update mt7915/mt7986/mt7915 gloden fimware

[Release-log]
N/A

Change-Id: Ic5c2247e206cb5221e5472421831b136887b7e9c
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6930574
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99900-hostapd-mtk-Add-neighbor-report-and-BSS-Termination.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99900-hostapd-mtk-Add-neighbor-report-and-BSS-Termination.patch
index 28af8ef..f790577 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99900-hostapd-mtk-Add-neighbor-report-and-BSS-Termination.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99900-hostapd-mtk-Add-neighbor-report-and-BSS-Termination.patch
@@ -1,7 +1,7 @@
-From af1bd5256cc764fb222f9809996851ff3d879699 Mon Sep 17 00:00:00 2001
+From 4791a374c9861b0d90db7fbdefe509f4e7d12247 Mon Sep 17 00:00:00 2001
 From: "howard.hsu" <howard-yh.hsu@mediatek.com>
 Date: Wed, 19 Jan 2022 19:18:07 +0800
-Subject: [PATCH 99900/99909] hostapd: mtk: Add neighbor report and BSS
+Subject: [PATCH 99900/99910] hostapd: mtk: Add neighbor report and BSS
  Termination for MBO certification
 
 1. Add hostapd_neighbor_count() and hostapd_neighbor_insert_buffer ()
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99901-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99901-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch
index 054dfb0..3c5137d 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99901-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99901-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch
@@ -1,7 +1,7 @@
-From f5c37c459c33bb8e228a88ba8efdea68bb75abd3 Mon Sep 17 00:00:00 2001
+From 6d95c027c13fba5404fa8d096d55b4a072b2ec59 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Tue, 20 Sep 2022 19:33:45 +0800
-Subject: [PATCH 99901/99909] hostapd: mtk: print sae groups by hostapd ctrl
+Subject: [PATCH 99901/99910] hostapd: mtk: print sae groups by hostapd ctrl
 
 ---
  hostapd/ctrl_iface.c | 13 +++++++++++++
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99902-hostapd-mtk-add-support-for-runtime-set-in-band-dis.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99902-hostapd-mtk-add-support-for-runtime-set-in-band-dis.patch
index 6fa23c0..885c6c9 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99902-hostapd-mtk-add-support-for-runtime-set-in-band-dis.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99902-hostapd-mtk-add-support-for-runtime-set-in-band-dis.patch
@@ -1,7 +1,7 @@
-From ce684a1adac0b5b699482924eb86f8f1b8205e57 Mon Sep 17 00:00:00 2001
+From 7a84545afb1f5bc2784eb5a046d56d869fb52067 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Tue, 31 May 2022 21:15:54 +0800
-Subject: [PATCH 99902/99909] hostapd: mtk: add support for runtime set in-band
+Subject: [PATCH 99902/99910] hostapd: mtk: add support for runtime set in-band
  discovery
 
 Usage:
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99903-hostapd-mtk-Add-mtk_vendor.h.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99903-hostapd-mtk-Add-mtk_vendor.h.patch
index a15287e..d108ca3 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99903-hostapd-mtk-Add-mtk_vendor.h.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99903-hostapd-mtk-Add-mtk_vendor.h.patch
@@ -1,7 +1,7 @@
-From e4b9b5847090d25009a4cf104052ba0490e95ffe Mon Sep 17 00:00:00 2001
+From 8694400211d08019e4c495fc98ca3e3783465044 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Mon, 30 May 2022 15:04:57 +0800
-Subject: [PATCH 99903/99909] hostapd: mtk: Add mtk_vendor.h
+Subject: [PATCH 99903/99910] hostapd: mtk: Add mtk_vendor.h
 
 ---
  src/common/mtk_vendor.h | 195 ++++++++++++++++++++++++++++++++++++++++
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99904-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99904-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch
index 40dded6..e9bb053 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99904-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99904-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch
@@ -1,7 +1,7 @@
-From cef7f515eafeeaa99933cc9e66c79b705e3ab065 Mon Sep 17 00:00:00 2001
+From d3d5b514064036fb17729743fa13e25646f468e9 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Mon, 30 May 2022 16:31:34 +0800
-Subject: [PATCH 99904/99909] hostapd: mtk: Support EDCCA hostapd configuration
+Subject: [PATCH 99904/99910] hostapd: mtk: Support EDCCA hostapd configuration
 
 edcca_enable and edcca_compensation and implement edcca related handlers.
 ---
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99905-hostapd-mtk-Add-hostapd-HEMU-SET-GET-control.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99905-hostapd-mtk-Add-hostapd-HEMU-SET-GET-control.patch
index 18617be..1a622f3 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99905-hostapd-mtk-Add-hostapd-HEMU-SET-GET-control.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99905-hostapd-mtk-Add-hostapd-HEMU-SET-GET-control.patch
@@ -1,7 +1,7 @@
-From a288f97e708bc579e285b509f7c0655c2f27a76c Mon Sep 17 00:00:00 2001
+From 893c5f92257a7313a179dc728ba51a74efbfc74a Mon Sep 17 00:00:00 2001
 From: TomLiu <tomml.liu@mediatek.com>
 Date: Tue, 9 Aug 2022 10:23:44 -0700
-Subject: [PATCH 99905/99909] hostapd: mtk: Add hostapd HEMU SET/GET control
+Subject: [PATCH 99905/99910] hostapd: mtk: Add hostapd HEMU SET/GET control
 
 ---
  hostapd/config_file.c             |   9 +++
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99906-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99906-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-.patch
index fc81ed1..594e476 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99906-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99906-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-.patch
@@ -1,7 +1,7 @@
-From 26c6be11e7597490ccc4d7704542c78dec6c4cd1 Mon Sep 17 00:00:00 2001
+From c91612769eba54821da1136d5959a40438c02824 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 2 Sep 2022 01:03:23 +0800
-Subject: [PATCH 99906/99909] hostapd: mtk: Add three wire PTA ctrl hostapd
+Subject: [PATCH 99906/99910] hostapd: mtk: Add three wire PTA ctrl hostapd
  vendor command
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99907-hostapd-mtk-Add-hostapd-iBF-control.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99907-hostapd-mtk-Add-hostapd-iBF-control.patch
index 50a08ba..c37cb40 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99907-hostapd-mtk-Add-hostapd-iBF-control.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99907-hostapd-mtk-Add-hostapd-iBF-control.patch
@@ -1,7 +1,7 @@
-From 1f60afd21c6dd7dfe3d504dee7507654a981033b Mon Sep 17 00:00:00 2001
+From 4971762bfaba906054d43bd2d042c436a1ac97b2 Mon Sep 17 00:00:00 2001
 From: mtk27835 <shurong.wen@mediatek.com>
 Date: Wed, 7 Sep 2022 14:41:51 -0700
-Subject: [PATCH 99907/99909] hostapd: mtk: Add hostapd iBF control
+Subject: [PATCH 99907/99910] hostapd: mtk: Add hostapd iBF control
 
 Signed-off-by: mtk27835 <shurong.wen@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99908-hostapd-mtk-Do-not-include-HE-capab-IE-if-associate.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99908-hostapd-mtk-Do-not-include-HE-capab-IE-if-associate.patch
index 9b96d98..47628d7 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99908-hostapd-mtk-Do-not-include-HE-capab-IE-if-associate.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99908-hostapd-mtk-Do-not-include-HE-capab-IE-if-associate.patch
@@ -1,7 +1,7 @@
-From 28228a96980512f30c8c8aac0f819c36f7241b68 Mon Sep 17 00:00:00 2001
+From f96a62568fb3c419e71f8d7469d485dce55f4da6 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Thu, 22 Sep 2022 16:08:09 +0800
-Subject: [PATCH 99908/99909] hostapd: mtk: Do not include HE capab IE if
+Subject: [PATCH 99908/99910] hostapd: mtk: Do not include HE capab IE if
  associated sta's HE capab IE is invalid
 
 ---
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99909-hostapd-mtk-Add-DFS-and-ZWDFS-support.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99909-hostapd-mtk-Add-DFS-and-ZWDFS-support.patch
index 8da9b5f..c1fc3f1 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99909-hostapd-mtk-Add-DFS-and-ZWDFS-support.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99909-hostapd-mtk-Add-DFS-and-ZWDFS-support.patch
@@ -1,7 +1,7 @@
-From 737d21c64ab0ac49e9cce7185f1f79bb0b71f50e Mon Sep 17 00:00:00 2001
+From 782f38f2eec27e438e55cb09e824a6ffc1c3eb18 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 7 Oct 2022 10:46:29 +0800
-Subject: [PATCH 99909/99909] hostapd: mtk: Add DFS and ZWDFS support
+Subject: [PATCH 99909/99910] hostapd: mtk: Add DFS and ZWDFS support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/99910-hostapd-mtk-Add-amsdu-set-get-ctrl.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/99910-hostapd-mtk-Add-amsdu-set-get-ctrl.patch
index db334ed..c05a444 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/99910-hostapd-mtk-Add-amsdu-set-get-ctrl.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/99910-hostapd-mtk-Add-amsdu-set-get-ctrl.patch
@@ -1,7 +1,7 @@
-From 41664bc1e66af23e0c664cd67c04bf1dd7985704 Mon Sep 17 00:00:00 2001
-From: TomLiu <tomml.liu@mediatek.com>
-Date: Wed, 14 Dec 2022 01:08:56 -0800
-Subject: [PATCH] [hostapd]amsdu-config-set-and-hostapd_cli-get-commands
+From 6cf5ec59e09945a075909b8070d9795869db081e Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Fri, 16 Dec 2022 03:57:11 +0800
+Subject: [PATCH 99910/99910] hostapd: mtk: Add amsdu set get ctrl
 
 ---
  hostapd/config_file.c             |   9 +++
@@ -240,7 +240,7 @@
  
  /**
 diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
-index 7472542..6702384 100644
+index 003adc4..5c04284 100644
 --- a/src/drivers/driver_nl80211.c
 +++ b/src/drivers/driver_nl80211.c
 @@ -12804,6 +12804,118 @@ fail:
@@ -396,5 +396,5 @@
  			}
  
 -- 
-2.32.0
+2.36.1