[][MAC80211][misc][Change autobuild folder name to distinguish kernel5.4 and upcoming kernel6.6]

[Description]
Change autobuild folder name to distinguish kernel5.4 and upcoming kernel6.6
Fix WiFi7 MLO and WiFi6 Release Build Fail

[Release-log]
N/A

Change-Id: I6fced9e0f2a2fe28b514642804e00486156f1c63
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9364111
diff --git a/autobuild_mac80211_release/0000-use-current-epoch-date-for-version.patch b/autobuild/autobuild_5.4_mac80211_release/0000-use-current-epoch-date-for-version.patch
similarity index 100%
rename from autobuild_mac80211_release/0000-use-current-epoch-date-for-version.patch
rename to autobuild/autobuild_5.4_mac80211_release/0000-use-current-epoch-date-for-version.patch
diff --git a/autobuild_mac80211_release/0001-wifi6-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild/autobuild_5.4_mac80211_release/0001-wifi6-mac80211-generate-hostapd-setting-from-ap-cap.patch
similarity index 100%
rename from autobuild_mac80211_release/0001-wifi6-mac80211-generate-hostapd-setting-from-ap-cap.patch
rename to autobuild/autobuild_5.4_mac80211_release/0001-wifi6-mac80211-generate-hostapd-setting-from-ap-cap.patch
diff --git a/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch b/autobuild/autobuild_5.4_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
similarity index 100%
rename from autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
rename to autobuild/autobuild_5.4_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch
diff --git a/autobuild_mac80211_release/0002-wifi6-hostapd-makefile-for-utils.patch b/autobuild/autobuild_5.4_mac80211_release/0002-wifi6-hostapd-makefile-for-utils.patch
similarity index 100%
rename from autobuild_mac80211_release/0002-wifi6-hostapd-makefile-for-utils.patch
rename to autobuild/autobuild_5.4_mac80211_release/0002-wifi6-hostapd-makefile-for-utils.patch
diff --git a/autobuild_mac80211_release/0002-wifi7-hostapd-makefile-for-utils.patch b/autobuild/autobuild_5.4_mac80211_release/0002-wifi7-hostapd-makefile-for-utils.patch
similarity index 100%
rename from autobuild_mac80211_release/0002-wifi7-hostapd-makefile-for-utils.patch
rename to autobuild/autobuild_5.4_mac80211_release/0002-wifi7-hostapd-makefile-for-utils.patch
diff --git a/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch b/autobuild/autobuild_5.4_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
similarity index 100%
rename from autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
rename to autobuild/autobuild_5.4_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
diff --git a/autobuild_mac80211_release/0004-2102-netfilter-remove-nf_flow_table_hw.patch b/autobuild/autobuild_5.4_mac80211_release/0004-2102-netfilter-remove-nf_flow_table_hw.patch
similarity index 100%
rename from autobuild_mac80211_release/0004-2102-netfilter-remove-nf_flow_table_hw.patch
rename to autobuild/autobuild_5.4_mac80211_release/0004-2102-netfilter-remove-nf_flow_table_hw.patch
diff --git a/autobuild_mac80211_release/0005-add-netfilter-netlink-ftnl-package.patch b/autobuild/autobuild_5.4_mac80211_release/0005-add-netfilter-netlink-ftnl-package.patch
similarity index 100%
rename from autobuild_mac80211_release/0005-add-netfilter-netlink-ftnl-package.patch
rename to autobuild/autobuild_5.4_mac80211_release/0005-add-netfilter-netlink-ftnl-package.patch
diff --git a/autobuild_mac80211_release/0006-network-enable-bridge-igmp_snooping-by-default.patch b/autobuild/autobuild_5.4_mac80211_release/0006-network-enable-bridge-igmp_snooping-by-default.patch
similarity index 100%
rename from autobuild_mac80211_release/0006-network-enable-bridge-igmp_snooping-by-default.patch
rename to autobuild/autobuild_5.4_mac80211_release/0006-network-enable-bridge-igmp_snooping-by-default.patch
diff --git a/autobuild_mac80211_release/0007-relayd-change-trigger-reload-to-trigger-restart.patch b/autobuild/autobuild_5.4_mac80211_release/0007-relayd-change-trigger-reload-to-trigger-restart.patch
similarity index 100%
rename from autobuild_mac80211_release/0007-relayd-change-trigger-reload-to-trigger-restart.patch
rename to autobuild/autobuild_5.4_mac80211_release/0007-relayd-change-trigger-reload-to-trigger-restart.patch
diff --git a/autobuild_mac80211_release/0010-add-llvm_bpf-toolchain.patch b/autobuild/autobuild_5.4_mac80211_release/0010-add-llvm_bpf-toolchain.patch
similarity index 100%
rename from autobuild_mac80211_release/0010-add-llvm_bpf-toolchain.patch
rename to autobuild/autobuild_5.4_mac80211_release/0010-add-llvm_bpf-toolchain.patch
diff --git a/autobuild_mac80211_release/Release.md b/autobuild/autobuild_5.4_mac80211_release/Release.md
similarity index 100%
rename from autobuild_mac80211_release/Release.md
rename to autobuild/autobuild_5.4_mac80211_release/Release.md
diff --git a/autobuild_mac80211_release/clean-staging.sh b/autobuild/autobuild_5.4_mac80211_release/clean-staging.sh
similarity index 100%
rename from autobuild_mac80211_release/clean-staging.sh
rename to autobuild/autobuild_5.4_mac80211_release/clean-staging.sh
diff --git a/autobuild_mac80211_release/feeds.conf.default b/autobuild/autobuild_5.4_mac80211_release/feeds.conf.default
similarity index 100%
rename from autobuild_mac80211_release/feeds.conf.default
rename to autobuild/autobuild_5.4_mac80211_release/feeds.conf.default
diff --git a/autobuild_mac80211_release/feeds.conf.default-21.02 b/autobuild/autobuild_5.4_mac80211_release/feeds.conf.default-21.02
similarity index 100%
rename from autobuild_mac80211_release/feeds.conf.default-21.02
rename to autobuild/autobuild_5.4_mac80211_release/feeds.conf.default-21.02
diff --git a/autobuild_mac80211_release/get_stagingdir_root.mk b/autobuild/autobuild_5.4_mac80211_release/get_stagingdir_root.mk
similarity index 100%
rename from autobuild_mac80211_release/get_stagingdir_root.mk
rename to autobuild/autobuild_5.4_mac80211_release/get_stagingdir_root.mk
diff --git a/autobuild_mac80211_release/lede-build-sanity.sh b/autobuild/autobuild_5.4_mac80211_release/lede-build-sanity.sh
similarity index 83%
rename from autobuild_mac80211_release/lede-build-sanity.sh
rename to autobuild/autobuild_5.4_mac80211_release/lede-build-sanity.sh
index 366d44d..41d1d3f 100755
--- a/autobuild_mac80211_release/lede-build-sanity.sh
+++ b/autobuild/autobuild_5.4_mac80211_release/lede-build-sanity.sh
@@ -9,6 +9,11 @@
 BUILD_TIME=`date +%Y%m%d%H%M%S`
 build_flag=0
 
+# Bypass the hash check to prevent the related packages obtained from the
+# master branch from being affected by the changes made below, causing build fail.
+# https://github.com/openwrt/openwrt/commit/e8725a932e16eaf6ec51add8c084d959cbe32ff2
+SKIP_PKG_HASH_CHECK=1
+
 if [ -z ${BUILD_DIR} ]; then
 	LOCAL=1
 	BUILD_DIR=`pwd`
@@ -16,6 +21,7 @@
 
 MTK_FEED_DIR=${BUILD_DIR}/feeds/mtk_openwrt_feed
 MTK_MANIFEST_FEED=${BUILD_DIR}/../mtk-openwrt-feeds
+MAC80211_AUTOBUILD_RELEASE=${MTK_FEED_DIR}/autobuild/autobuild_5.4_mac80211_release
 
 if [ -z ${INSTALL_DIR} ]; then
 	INSTALL_DIR=autobuild_release
@@ -114,9 +120,6 @@
 
 	add_proprietary_kernel_files
 
-	#add common patch
-	cp -rfa ${BUILD_DIR}/autobuild/package ${BUILD_DIR}
-
 	#do mtk_wifi openwrt patch
 	do_patch ${BUILD_DIR}/autobuild/openwrt_patches${OPENWRT_VER}/mtk_wifi || exit 1
 }
@@ -144,10 +147,9 @@
 
 	cp -fpR ${BUILD_DIR}/./../mac80211_package/package/network/services/bridger ${BUILD_DIR}/package/network/services
 
-	patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0010-add-llvm_bpf-toolchain.patch || exit 1
-
-	patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0004-2102-netfilter-remove-nf_flow_table_hw.patch || exit 1
-	patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0005-add-netfilter-netlink-ftnl-package.patch || exit 1
+	patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0010-add-llvm_bpf-toolchain.patch || exit 1
+	patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0004-2102-netfilter-remove-nf_flow_table_hw.patch || exit 1
+	patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0005-add-netfilter-netlink-ftnl-package.patch || exit 1
 
 	#rm patches for flowblock
 	rm -rf ./target/linux/generic/pending-5.4/64*.patch
@@ -200,12 +202,12 @@
 	if [ "$2" = "1" ]; then
 		echo "========================Hostapd NEW==================="
 		cp -fpR ${BUILD_DIR}/./../mac80211_package/package/network/services/hostapd ${BUILD_DIR}/package/network/services
-		rm -rf  ${MTK_FEED_DIR}/autobuild_mac80211_release/package/network/services/hostapd
-		cp -fpR ${MTK_FEED_DIR}/autobuild_mac80211_release/package/network/services/hostapd_new ${MTK_FEED_DIR}/autobuild_mac80211_release/package/network/services/hostapd
-		do_patch ${MTK_FEED_DIR}/autobuild_mac80211_release/openwrt_patches${OPENWRT_VER}/hostapd || exit 1
+		rm -rf  ${MAC80211_AUTOBUILD_RELEASE}/package/network/services/hostapd
+		cp -fpR ${MAC80211_AUTOBUILD_RELEASE}/package/network/services/hostapd_new ${MAC80211_AUTOBUILD_RELEASE}/package/network/services/hostapd
+		do_patch ${MAC80211_AUTOBUILD_RELEASE}/openwrt_patches${OPENWRT_VER}/hostapd || exit 1
 	else
 		echo "========================Hostapd OLD==================="
-		tar xvf ${MTK_FEED_DIR}/autobuild_mac80211_release/package/network/services/hostapd/hostapd_v2.10_07730ff3.tar.gz -C ${BUILD_DIR}/package/network/services/
+		tar xvf ${MAC80211_AUTOBUILD_RELEASE}/package/network/services/hostapd/hostapd_v2.10_07730ff3.tar.gz -C ${BUILD_DIR}/package/network/services/
 	fi
 
 	rm -rf ${BUILD_DIR}/package/libs/libnl-tiny
@@ -221,8 +223,8 @@
 	if [ "$2" = "1" ]; then
 		echo "=========================Netifd NEW====================="
 		cp -fpR ${BUILD_DIR}/./../mac80211_package/package/network/config/netifd ${BUILD_DIR}/package/network/config
-		rm -rf  ${MTK_FEED_DIR}/autobuild_mac80211_release/package/network/config/netifd
-		cp -fpR ${MTK_FEED_DIR}/autobuild_mac80211_release/package/network/config/netifd_new ${MTK_FEED_DIR}/autobuild_mac80211_release/package/network/config/netifd
+		rm -rf  ${MAC80211_AUTOBUILD_RELEASE}/package/network/config/netifd
+		cp -fpR ${MAC80211_AUTOBUILD_RELEASE}/package/network/config/netifd_new ${MAC80211_AUTOBUILD_RELEASE}/package/network/config/netifd
 		#wifi-scripts
 		rm -rf ${BUILD_DIR}/package/base-files/files/sbin/wifi
 		rm -rf ${BUILD_DIR}/package/network/config/wifi-scripts
@@ -247,7 +249,7 @@
 		#rpcd
 		rm -rf ${BUILD_DIR}/package/system/rpcd
 		cp -fpR ${BUILD_DIR}/./../mac80211_package/package/system/rpcd ${BUILD_DIR}/package/system
-		rm -rf ${MTK_FEED_DIR}/autobuild_mac80211_release/package/system/rpcd
+		rm -rf ${MAC80211_AUTOBUILD_RELEASE}/package/system/rpcd
 		#procd
 		rm -rf ${BUILD_DIR}/package/system/procd
 		cp -fpR ${BUILD_DIR}/./../mac80211_package/package/system/procd ${BUILD_DIR}/package/system
@@ -259,11 +261,11 @@
 	if [ "$1" = "1" ]; then
 		echo "=========================MAC80211 v6.1==================="
 		cp -fpR ${BUILD_DIR}/./../mac80211_package/package/kernel/mac80211 ${BUILD_DIR}/package/kernel
-		rm -rf  ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211
-		cp -fpR ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211_dev ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211
+		rm -rf  ${MAC80211_AUTOBUILD_RELEASE}/package/kernel/mac80211
+		cp -fpR ${MAC80211_AUTOBUILD_RELEASE}/package/kernel/mac80211_dev ${MAC80211_AUTOBUILD_RELEASE}/package/kernel/mac80211
 	else
 		echo "=========================MAC80211 v5.15=================="
-		tar xvf ${MTK_FEED_DIR}/autobuild_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz -C ${BUILD_DIR}/package/kernel/
+		tar xvf ${MAC80211_AUTOBUILD_RELEASE}/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz -C ${BUILD_DIR}/package/kernel/
 	fi
 
 	rm -rf ${BUILD_DIR}/package/firmware/wireless-regdb
@@ -331,30 +333,35 @@
 
 	# MAC80211/Hostapd Script
 	if [ "$1" = "1" ]; then
-			patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch || exit 1
+			patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0001-wifi7-mac80211-generate-hostapd-setting-from-ap-cap.patch || exit 1
 	else
-			patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0001-wifi6-mac80211-generate-hostapd-setting-from-ap-cap.patch || exit 1
+			patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0001-wifi6-mac80211-generate-hostapd-setting-from-ap-cap.patch || exit 1
 	fi
 
 	# Hostapd Makefile
 	if [ "$2" = "1" ]; then
-			patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0002-wifi7-hostapd-makefile-for-utils.patch || exit 1
+			patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0002-wifi7-hostapd-makefile-for-utils.patch || exit 1
 	else
-			patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0002-wifi6-hostapd-makefile-for-utils.patch || exit 1
+			patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0002-wifi6-hostapd-makefile-for-utils.patch || exit 1
 	fi
 
 	# MT76 Makefile
-	patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch || exit 1
-	cp -rfa ${MTK_FEED_DIR}/autobuild_mac80211_release/package/ ${BUILD_DIR}
-	cp -rfa ${MTK_FEED_DIR}/autobuild_mac80211_release/target/ ${BUILD_DIR}
+	patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0003-master-mt76-makefile-for-new-chip.patch || exit 1
+	cp -rfa ${MAC80211_AUTOBUILD_RELEASE}/package/ ${BUILD_DIR}
+	cp -rfa ${MAC80211_AUTOBUILD_RELEASE}/target/ ${BUILD_DIR}
 
 	# Bridge Default Setting
-	patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0006-network-enable-bridge-igmp_snooping-by-default.patch || exit 1
+	patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0006-network-enable-bridge-igmp_snooping-by-default.patch || exit 1
 
 	# Relayd change trigger reload to trigger restart
-	patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0007-relayd-change-trigger-reload-to-trigger-restart.patch || exit 1
+	patch -f -p1 -i ${MAC80211_AUTOBUILD_RELEASE}/0007-relayd-change-trigger-reload-to-trigger-restart.patch || exit 1
 }
 
+prepare_opensync() {
+	for pch in autobuild/$1/patch_for_local/*; do patch -p1 < $pch; done
+	cp -rfa ${BUILD_DIR}/../app/opensync/* ${BUILD_DIR}/../
+}
+
 copy_main_Config() {
 	echo cp -rfa autobuild/$1/.config ./.config
 	cp -rfa autobuild/$1/.config ./.config
@@ -394,10 +401,10 @@
 }
 
 install_output_KernelDebugFile() {
-	KernelDebugFile=bin/targets/$3/mt${2}*/kernel-debug.tar.bz2
+	KernelDebugFile=bin/targets/$3/mt${2}*/kernel-debug.tar.zst
 	if [ -f ${KernelDebugFile} ]; then
-		echo cp -rfa ${KernelDebugFile} ${INSTALL_DIR}/$1/kernel-debug.tar.bz2
-		cp -rfa ${KernelDebugFile} ${INSTALL_DIR}/$1/kernel-debug.tar.bz2
+		echo cp -rfa ${KernelDebugFile} ${INSTALL_DIR}/$1/kernel-debug.tar.zst
+		cp -rfa ${KernelDebugFile} ${INSTALL_DIR}/$1/kernel-debug.tar.zst
 	fi
 }
 
@@ -453,6 +460,9 @@
 
 	#install output feeds buildinfo
 	install_output_feeds_buildinfo $1 ${chip_name} ${arch_name}
+
+	#tarball for AT
+	install_output_at $1
 }
 
 prepare_final() {
@@ -510,8 +520,14 @@
 
 	#make
 
-	echo "make  V=s -j $(($(nproc) + 1)) download world"
-	make  V=s -j $(($(nproc) + 1)) download world || exit 1
+	if [ ${SKIP_PKG_HASH_CHECK} -eq 1 ]; then
+		echo "make  V=1 -j $(($(nproc) + 1)) download world PKG_HASH=skip PKG_MIRROR_HASH=skip"
+		make V=1 -j $(($(nproc) + 1)) download world PKG_HASH=skip PKG_MIRROR_HASH=skip || \
+		make V=s -j $(($(nproc) + 1)) PKG_HASH=skip PKG_MIRROR_HASH=skip || exit 1
+	else
+		echo "make  V=1 -j $(($(nproc) + 1)) download world"
+		make V=1 -j $(($(nproc) + 1)) download world || make V=s -j $(($(nproc) + 1)) || exit 1
+	fi
 
 	#tar unstripped rootfs for debug symbols
 	install_release $1
@@ -525,10 +541,19 @@
 
 	cd ${BUILD_DIR}
 
+	echo ln -s ../dl dl
+	ln -s ../dl dl
+
 	#make
 
-	echo "make  V=s -j $(($(nproc) + 1)) download world"
-	make  V=s -j $(($(nproc) + 1)) download world || make V=s -j1 || exit 1
+	if [ ${SKIP_PKG_HASH_CHECK} -eq 1 ]; then
+		echo "make  V=1 -j $(($(nproc) + 1)) download world PKG_HASH=skip PKG_MIRROR_HASH=skip"
+		make V=1 -j $(($(nproc) + 1)) download world PKG_HASH=skip PKG_MIRROR_HASH=skip || \
+		make V=s -j1 PKG_HASH=skip PKG_MIRROR_HASH=skip || exit 1
+	else
+		echo "make  V=1 -j $(($(nproc) + 1)) download world"
+		make V=1 -j $(($(nproc) + 1)) download world || make V=s -j1 || exit 1
+	fi
 
 	#tar unstripped rootfs for debug symbols
 	install_release $1
diff --git a/autobuild_mac80211_release/mt7981_mac80211/.config b/autobuild/autobuild_5.4_mac80211_release/mt7981_mac80211/.config
similarity index 100%
rename from autobuild_mac80211_release/mt7981_mac80211/.config
rename to autobuild/autobuild_5.4_mac80211_release/mt7981_mac80211/.config
diff --git a/autobuild_mac80211_release/mt7981_mac80211/lede-branch-build-sanity.sh b/autobuild/autobuild_5.4_mac80211_release/mt7981_mac80211/lede-branch-build-sanity.sh
similarity index 100%
rename from autobuild_mac80211_release/mt7981_mac80211/lede-branch-build-sanity.sh
rename to autobuild/autobuild_5.4_mac80211_release/mt7981_mac80211/lede-branch-build-sanity.sh
diff --git a/autobuild_mac80211_release/mt7986_mac80211/.config b/autobuild/autobuild_5.4_mac80211_release/mt7986_mac80211/.config
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/.config
rename to autobuild/autobuild_5.4_mac80211_release/mt7986_mac80211/.config
diff --git a/autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh b/autobuild/autobuild_5.4_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
rename to autobuild/autobuild_5.4_mac80211_release/mt7986_mac80211/lede-branch-build-sanity.sh
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/.config b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/.config
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/.config
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/.config
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/lede-branch-build-sanity.sh b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/lede-branch-build-sanity.sh
similarity index 71%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/lede-branch-build-sanity.sh
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/lede-branch-build-sanity.sh
index 76abd9d..595357e 100755
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/lede-branch-build-sanity.sh
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/lede-branch-build-sanity.sh
@@ -7,8 +7,10 @@
 swpath=0
 backport_new=1
 hostapd_new=1
+release=1
 mt7992_fw=0
 mt7996_fw=0
+release_folder=${BUILD_DIR}/feeds/mtk_openwrt_feed/autobuild/autobuild_5.4_mac80211_release
 args=
 
 for arg in $*; do
@@ -19,6 +21,9 @@
 	"kasan")
 		kasan=1
 		;;
+	"release")
+		release=1
+		;;
 	"mt7992")
 		mt7992_fw=1
 		;;
@@ -66,6 +71,9 @@
 		sed -i '/CONFIG_SSTRIP_ARGS="-z"/d' ${BUILD_DIR}/.config
 		sed -i 's/# CONFIG_NO_STRIP is not set/CONFIG_NO_STRIP=y/g' ${BUILD_DIR}/.config
 	}
+	[ "$release" = "1" ] && {
+		cp -rfa ${release_folder}/package/kernel/mt76/src/firmware ${BUILD_DIR}/package/kernel/mt76/src
+	}
 	[ "$mt7992_fw" = "1" -a "$mt7996_fw" = "0" ] && {
 		sed -i 's/CONFIG_PACKAGE_kmod-mt7996-firmware=y/# CONFIG_PACKAGE_kmod-mt7996-firmware is not set/g' ${BUILD_DIR}/.config
 	}
@@ -84,11 +92,8 @@
 #prepare mac80211 mt76 wifi stuff
 prepare_mac80211 ${backport_new} ${hostapd_new}
 
-# remove original mt76/hostapd/backport patches and use mlo autobuild one
+# find ${BUILD_DIR}/package/kernel/mt76/patches -name "*-mt76-*.patch" -delete
 rm -rf ${BUILD_DIR}/package/kernel/mt76/patches/*
-rm -rf ${BUILD_DIR}/package/kernel/mac80211/patches/*
-rm -rf ${BUILD_DIR}/package/network/services/hostapd/patches/*
-rm -rf ${BUILD_DIR}/package/network/utils/iw/patches/*
 
 # remove crypto-eip package since it not support at mt76 yet
 rm -rf ${BUILD_DIR}/package/mtk_soc/drivers/crypto-eip/
@@ -99,23 +104,41 @@
 # ===========================================================
 
 # ========== specific modification on mt7996 autobuild for MLO support ==========
-do_patch ${MTK_FEED_DIR}/autobuild_mac80211_release/openwrt_patches${OPENWRT_VER}/wifi7_mlo || exit 1
+do_patch ${MTK_FEED_DIR}/autobuild/autobuild_5.4_mac80211_release/openwrt_patches${OPENWRT_VER}/wifi7_mlo || exit 1
+
+if [ "$release" = '1' ]; then
+	# remove original mt76/hostapd/backport patches and use mlo autobuild one
+	rm -rf ${BUILD_DIR}/package/kernel/mt76/patches/*
+	rm -rf ${BUILD_DIR}/package/kernel/mac80211/patches/*
+	rm -rf ${BUILD_DIR}/package/network/services/hostapd/patches/*
+	rm -rf ${BUILD_DIR}/package/network/utils/iw/patches/*
+	# ========== follow mt7988_wifi7_mac80211_mlo git01 patches ========================
+	rm -rf ${BUILD_DIR}/autobuild/${branch_name}/package
+	cp -rf ${release_folder}/mt7988_wifi7_mac80211_mlo/package/* ${BUILD_DIR}/package/
+	# ===========================================================
+fi
 
 # disable RADIUS in hostapd config
 sed -i "s/.*CONFIG_RADIUS_SERVER.*/# CONFIG_RADIUS_SERVER=y/g" ${BUILD_DIR}/package/network/services/hostapd/files/hostapd-full.config
 sed -i "s/.*CONFIG_NO_RADIUS=y.*/CONFIG_NO_RADIUS=y/g" ${BUILD_DIR}/package/network/services/hostapd/files/hostapd-full.config
-
-# remove hostapd src folder
-rm -rf ${BUILD_DIR}/package/network/services/hostapd/src
+# turning on hostapd -T option by default
+sed -i "s/.*CONFIG_DEBUG_LINUX_TRACING=y.*/CONFIG_DEBUG_LINUX_TRACING=y/g" ${BUILD_DIR}/package/network/services/hostapd/files/hostapd-full.config
+# ===========================================================
 
 prepare_final ${branch_name}
 
 # untar backports tarball
-WIFI7_MAC80211_DIR=${BUILD_DIR}/package/kernel/mac80211
-rm -rf ${WIFI7_MAC80211_DIR}/src
-tarball=$(find ${WIFI7_MAC80211_DIR}/backports*.tar.xz -printf "%f\n")
-tar -xJf ${WIFI7_MAC80211_DIR}/${tarball}
-mv $(echo ${tarball} | cut -d '.' -f 1) ${WIFI7_MAC80211_DIR}/src
+if [ "$release" = '1' ]; then
+	# remove hostapd src folder
+	WIFI7_Hostapd_SOURCE_DIR=${BUILD_DIR}/package/network/services/hostapd/src;
+	rm -rf ${WIFI7_Hostapd_SOURCE_DIR};
+	# remove mac80211 src folder
+	WIFI7_MAC80211_DIR=${BUILD_DIR}/package/kernel/mac80211
+	rm -rf ${WIFI7_MAC80211_DIR}/src
+	tarball=$(find ${WIFI7_MAC80211_DIR}/backports*.tar.xz -printf "%f\n")
+	tar -xJf ${WIFI7_MAC80211_DIR}/${tarball}
+	mv $(echo ${tarball} | cut -d '.' -f 1) ${WIFI7_MAC80211_DIR}/src
+fi
 
 change_dot_config
 
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/backports-2024-04-03.tar.xz b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/backports-2024-04-03.tar.xz
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/backports-2024-04-03.tar.xz
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/backports-2024-04-03.tar.xz
Binary files differ
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0001-sync-backports-patches-build.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0001-sync-backports-patches-build.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0001-sync-backports-patches-build.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0001-sync-backports-patches-build.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0002-sync-backports-patches-ath.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0002-sync-backports-patches-ath.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0002-sync-backports-patches-ath.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0002-sync-backports-patches-ath.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0003-sync-backports-patches-ath5k.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0003-sync-backports-patches-ath5k.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0003-sync-backports-patches-ath5k.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0003-sync-backports-patches-ath5k.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0004-sync-backports-patches-ath9k.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0004-sync-backports-patches-ath9k.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0004-sync-backports-patches-ath9k.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0004-sync-backports-patches-ath9k.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0005-sync-backports-patches-ath10k.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0005-sync-backports-patches-ath10k.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0005-sync-backports-patches-ath10k.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0005-sync-backports-patches-ath10k.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0006-sync-backports-patches-rt2x00.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0006-sync-backports-patches-rt2x00.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0006-sync-backports-patches-rt2x00.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0006-sync-backports-patches-rt2x00.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0007-sync-backports-patches-subsys.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0007-sync-backports-patches-subsys.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0007-sync-backports-patches-subsys.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0007-sync-backports-patches-subsys.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0008-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0008-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0008-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0008-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0009-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0009-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0009-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0009-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0010-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0010-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0010-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0010-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0011-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0012-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0012-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0012-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0012-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0013-mtk-mac80211-check-the-control-channel-before-downgr.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0014-mtk-mac80211-fix-tx-amsdu-aggregation.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0014-mtk-mac80211-fix-tx-amsdu-aggregation.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0014-mtk-mac80211-fix-tx-amsdu-aggregation.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0014-mtk-mac80211-fix-tx-amsdu-aggregation.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0015-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0016-mtk-mac80211-track-obss-color-bitmap.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0017-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0018-mtk-mac80211-support-configurable-addba-resp-time.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0018-mtk-mac80211-support-configurable-addba-resp-time.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0018-mtk-mac80211-support-configurable-addba-resp-time.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0018-mtk-mac80211-support-configurable-addba-resp-time.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0019-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0020-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0020-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0020-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0020-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0021-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0021-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0021-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0021-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0022-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0022-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0022-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0022-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0023-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0023-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0023-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0023-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0024-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0025-mtk-mac80211-add-EHT-BA1024-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0025-mtk-mac80211-add-EHT-BA1024-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0025-mtk-mac80211-add-EHT-BA1024-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0025-mtk-mac80211-add-EHT-BA1024-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0026-mtk-mac80211-add-rate-duration-for-EHT-rate.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0026-mtk-mac80211-add-rate-duration-for-EHT-rate.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0026-mtk-mac80211-add-rate-duration-for-EHT-rate.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0026-mtk-mac80211-add-rate-duration-for-EHT-rate.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0027-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0027-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0027-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0027-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0028-mtk-mac80211-inrease-beacon-loss-count.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0028-mtk-mac80211-inrease-beacon-loss-count.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0028-mtk-mac80211-inrease-beacon-loss-count.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0028-mtk-mac80211-inrease-beacon-loss-count.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0029-mtk-cfg80211-add-support-for-updating-background-cha.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0029-mtk-cfg80211-add-support-for-updating-background-cha.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0029-mtk-cfg80211-add-support-for-updating-background-cha.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0029-mtk-cfg80211-add-support-for-updating-background-cha.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0030-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0030-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0030-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0030-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0031-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0031-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0031-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0031-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0032-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0032-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0032-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0032-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0033-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0034-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0035-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0036-backports-update-kernel-version-check-for-eth_hw_add.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0037-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0038-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0039-mtk-mac80211-allow-multiple-links-for-STA-vif.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0040-mtk-mac80211-increase-association-timeout-time.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0041-mtk-mac80211-fix-crash-when-starting-tx-ba-session.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0042-mtk-mac80211-use-link-address-for-eapol-source-in-ie.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0043-cfg80211-mtk-implement-DFS-radar-detect-for-MLO.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0044-mtk-wifi-mac80211-add-wds-mlo-support.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0045-mtk-mac80211-fix-ieee80211_probe_client-warning.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch
similarity index 100%
rename from 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
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0046-mtk-mac80211-remove-link-0-warn-on-in-rate_control_r.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0047-mtk-mac80211-fix-radar-required-of-link-issue-in-res.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0048-mtk-cfg80211-rework-cac-started-cac-start-time-for-m.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0049-mtk-mac80211-remove-links-when-removing-AP_VLAN-inte.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
similarity index 100%
rename from 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
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0050-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch
similarity index 100%
rename from 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
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0051-mtk-mac80211-fix-ieee80211_ht_cap_ie_to_sta_ht_cap-w.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch
similarity index 100%
rename from 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
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0052-mtk-mac80211-fix-mac-address-to-support-hw-path-in-s.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0053-mtk-mac80211-workaround-for-configuring-txpower-in-m.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0054-mtk-mac80211-send-broadcast-multicast-mgmt.-via-all-.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0055-mtk-mac80211-fix-mlo-BW-160-channel-switch-issue.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0056-mtk-mac80211-extend-IEEE80211_KEY_FLAG_GENERATE_MMIE.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch
similarity index 100%
rename from 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
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0057-mtk-wifi-mt76-mt7996-not-to-check-need_offchan-for-M.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0058-mtk-wifi-mt76-mt7996-assign-link-address-to-the-head.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0059-mtk-wifi-mt76-mt7996-Do-MLD-address-translation-befo.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0060-mtk-wifi-mac80211-defer-enabling-beacon-for-MLD-AP.patch
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/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mac80211/patches/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0061-mtk-wifi-mac80211-fix-radar-trigger-issue-due-to-ref.patch
diff --git a/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0062-mtk-mac80211-fix-build-issue-when-backport-version-o.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0062-mtk-mac80211-fix-build-issue-when-backport-version-o.patch
new file mode 100644
index 0000000..f8d358e
--- /dev/null
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mac80211/patches/subsys/0062-mtk-mac80211-fix-build-issue-when-backport-version-o.patch
@@ -0,0 +1,33 @@
+From ab7b8ab2b78b9f5a30f0465f0e6328abdbb7490c Mon Sep 17 00:00:00 2001
+From: Evelyn Tsai <evelyn.tsai@mediatek.com>
+Date: Tue, 16 Jul 2024 04:57:20 +0800
+Subject: [PATCH] 2
+
+---
+ backport-include/linux/soc/mediatek/mtk_wed.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/backport-include/linux/soc/mediatek/mtk_wed.h b/backport-include/linux/soc/mediatek/mtk_wed.h
+index 46caa89..de7303d 100644
+--- a/backport-include/linux/soc/mediatek/mtk_wed.h
++++ b/backport-include/linux/soc/mediatek/mtk_wed.h
+@@ -2,7 +2,7 @@
+ #define __BACKPORT_MTK_WED_H
+ #include <linux/version.h>
+ 
+-#if LINUX_VERSION_IS_GEQ(5,19,0)
++#if LINUX_VERSION_IS_GEQ(5,4,0)
+ #include_next <linux/soc/mediatek/mtk_wed.h>
+ #else
+ #include <linux/kernel.h>
+@@ -53,6 +53,6 @@ static inline bool mtk_wed_device_active(struct mtk_wed_device *dev)
+ #define mtk_wed_device_irq_get(_dev, _mask) 0
+ #define mtk_wed_device_irq_set_mask(_dev, _mask) do {} while (0)
+ 
+-#endif /* >= 5.19.0 */
++#endif /* >= 5.4.0 */
+ 
+ #endif /* __BACKPORT_MTK_WED_H */
+-- 
+2.18.0
+
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0001-mtk-Revert-wifi-mt76-mt7996-fill-txd-by-host-driver.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0001-mtk-Revert-wifi-mt76-mt7996-fill-txd-by-host-driver.patch
similarity index 91%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0001-mtk-Revert-wifi-mt76-mt7996-fill-txd-by-host-driver.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0001-mtk-Revert-wifi-mt76-mt7996-fill-txd-by-host-driver.patch
index 84e8b97..4b64141 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0001-mtk-Revert-wifi-mt76-mt7996-fill-txd-by-host-driver.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0001-mtk-Revert-wifi-mt76-mt7996-fill-txd-by-host-driver.patch
@@ -1,7 +1,7 @@
-From 803b79d47849d9f35f797f86efc63d57758a1dbd Mon Sep 17 00:00:00 2001
+From f10cd85a2f940a8c357ae6ddf892b985afcfed50 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Tue, 19 Sep 2023 11:21:23 +0800
-Subject: [PATCH 001/116] mtk: Revert "wifi: mt76: mt7996: fill txd by host
+Subject: [PATCH 001/115] mtk: Revert "wifi: mt76: mt7996: fill txd by host
  driver"
 
 This reverts commit 325a0c4931990d553487024c4f76c776492bdcc2.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0003-wifi-mt76-mt7996-use-hweight16-to-get-correct-tx_ant.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-use-hweight16-to-get-correct-tx_ant.patch
similarity index 88%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0003-wifi-mt76-mt7996-use-hweight16-to-get-correct-tx_ant.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-use-hweight16-to-get-correct-tx_ant.patch
index e1fdf6b..367f4bc 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0003-wifi-mt76-mt7996-use-hweight16-to-get-correct-tx_ant.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-use-hweight16-to-get-correct-tx_ant.patch
@@ -1,7 +1,7 @@
-From e9039f548952da4aa2f91d125da157974d0c0fa7 Mon Sep 17 00:00:00 2001
+From adfffcd06f40d7ec1b1417888fa3144e7de82bdd Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Wed, 10 Apr 2024 14:05:12 +0800
-Subject: [PATCH 003/116] wifi: mt76: mt7996: use hweight16 to get correct
+Subject: [PATCH 002/115] wifi: mt76: mt7996: use hweight16 to get correct
  tx_ant
 
 The chainmask is u16 so using hweight8 cannot get correct tx_ant.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0004-mtk-wifi-mt76-mt7996-fix-MBSS.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0003-mtk-wifi-mt76-mt7996-fix-MBSS.patch
similarity index 89%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0004-mtk-wifi-mt76-mt7996-fix-MBSS.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0003-mtk-wifi-mt76-mt7996-fix-MBSS.patch
index 9684e8b..ff669ed 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0004-mtk-wifi-mt76-mt7996-fix-MBSS.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0003-mtk-wifi-mt76-mt7996-fix-MBSS.patch
@@ -1,7 +1,7 @@
-From 3fc5e746e7fb33b2d2206f5fd3c5e9cd65b302f3 Mon Sep 17 00:00:00 2001
+From 37d585755139c9e798f60dfc754428992efffac2 Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Thu, 18 Apr 2024 14:19:21 +0800
-Subject: [PATCH 004/116] mtk: wifi: mt76: mt7996: fix MBSS
+Subject: [PATCH 003/115] mtk: wifi: mt76: mt7996: fix MBSS
 
 Refactor 11v mbss unicmd flow
 case1(disable->enable) : when we enable 11v MBSS, we have to add 11v mbss tlv(UNI_BSS_INFO_11V_MBSSID)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0005-wifi-mt76-mt7996-fix-HE-and-EHT-phy-cap.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0004-wifi-mt76-mt7996-fix-HE-and-EHT-phy-cap.patch
similarity index 89%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0005-wifi-mt76-mt7996-fix-HE-and-EHT-phy-cap.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0004-wifi-mt76-mt7996-fix-HE-and-EHT-phy-cap.patch
index 371bdf0..ef762e7 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0005-wifi-mt76-mt7996-fix-HE-and-EHT-phy-cap.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0004-wifi-mt76-mt7996-fix-HE-and-EHT-phy-cap.patch
@@ -1,7 +1,7 @@
-From 0a8c7ea3be6987390e2567a63659fec93aa3269c Mon Sep 17 00:00:00 2001
+From 2b0b0f76f2de4bcd9d8b18e47701e1b4160bb830 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 12 Mar 2024 09:07:52 +0800
-Subject: [PATCH 005/116] wifi: mt76: mt7996: fix HE and EHT phy cap
+Subject: [PATCH 004/115] wifi: mt76: mt7996: fix HE and EHT phy cap
 
 This commit fix he and eht phy capabailties ie. For HE phy cap, fix
 correct beamform capabilities for station vif. For EHT phy cap, remove
@@ -15,10 +15,10 @@
  1 file changed, 43 insertions(+), 22 deletions(-)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 9aa97e4..c264d50 100644
+index 283df84..a98dcb4 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -1010,8 +1010,6 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy,
+@@ -1011,8 +1011,6 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy,
  		return;
  
  	elem->phy_cap_info[3] |= IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;
@@ -27,7 +27,7 @@
  
  	c = FIELD_PREP(IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK,
  		       sts - 1) |
-@@ -1019,6 +1017,11 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy,
+@@ -1020,6 +1018,11 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy,
  		       sts - 1);
  	elem->phy_cap_info[5] |= c;
  
@@ -39,7 +39,7 @@
  	c = IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB |
  	    IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB;
  	elem->phy_cap_info[6] |= c;
-@@ -1178,7 +1181,6 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
+@@ -1179,7 +1182,6 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
  		IEEE80211_EHT_MAC_CAP0_OM_CONTROL;
  
  	eht_cap_elem->phy_cap_info[0] =
@@ -47,7 +47,7 @@
  		IEEE80211_EHT_PHY_CAP0_NDP_4_EHT_LFT_32_GI |
  		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |
  		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE;
-@@ -1192,30 +1194,36 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
+@@ -1193,30 +1195,36 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
  		u8_encode_bits(u8_get_bits(val, GENMASK(2, 1)),
  			       IEEE80211_EHT_PHY_CAP1_BEAMFORMEE_SS_80MHZ_MASK) |
  		u8_encode_bits(val,
@@ -94,7 +94,7 @@
  		u8_encode_bits(IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US,
  			       IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_MASK) |
  		u8_encode_bits(u8_get_bits(0x11, GENMASK(1, 0)),
-@@ -1229,14 +1237,6 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
+@@ -1230,14 +1238,6 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
  			       IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK) |
  		u8_encode_bits(val, IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK);
  
@@ -109,7 +109,7 @@
  	val = u8_encode_bits(nss, IEEE80211_EHT_MCS_NSS_RX) |
  	      u8_encode_bits(nss, IEEE80211_EHT_MCS_NSS_TX);
  #define SET_EHT_MAX_NSS(_bw, _val) do {				\
-@@ -1247,8 +1247,29 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
+@@ -1248,8 +1248,29 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
  
  	SET_EHT_MAX_NSS(80, val);
  	SET_EHT_MAX_NSS(160, val);
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0006-mtk-wifi-mt76-mt7996-adjust-Beamformee-SS-capability.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0005-mtk-wifi-mt76-mt7996-adjust-Beamformee-SS-capability.patch
similarity index 86%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0006-mtk-wifi-mt76-mt7996-adjust-Beamformee-SS-capability.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0005-mtk-wifi-mt76-mt7996-adjust-Beamformee-SS-capability.patch
index 9b56c52..c6b1d51 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0006-mtk-wifi-mt76-mt7996-adjust-Beamformee-SS-capability.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0005-mtk-wifi-mt76-mt7996-adjust-Beamformee-SS-capability.patch
@@ -1,7 +1,7 @@
-From 346eb89054af1f40dcceec43d128d8775081fd9a Mon Sep 17 00:00:00 2001
+From 9af33504e90b1399171c87a33dcbf98631fd7cc5 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 27 Feb 2024 14:50:20 +0800
-Subject: [PATCH 006/116] mtk: wifi: mt76: mt7996: adjust Beamformee SS
+Subject: [PATCH 005/115] mtk: wifi: mt76: mt7996: adjust Beamformee SS
  capability
 
 This commit includes two changes to adjust beamformee ss capability.
@@ -15,10 +15,10 @@
  1 file changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index c264d50..ab9445c 100644
+index a98dcb4..7d8d1e7 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -940,8 +940,12 @@ void mt7996_set_stream_vht_txbf_caps(struct mt7996_phy *phy)
+@@ -941,8 +941,12 @@ void mt7996_set_stream_vht_txbf_caps(struct mt7996_phy *phy)
  	cap = &phy->mt76->sband_5g.sband.vht_cap.cap;
  
  	*cap |= IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE |
@@ -33,7 +33,7 @@
  
  	*cap &= ~(IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK |
  		  IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE |
-@@ -986,9 +990,15 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy,
+@@ -987,9 +991,15 @@ mt7996_set_stream_he_txbf_caps(struct mt7996_phy *phy,
  	    IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO;
  	elem->phy_cap_info[2] |= c;
  
@@ -52,7 +52,7 @@
  	elem->phy_cap_info[4] |= c;
  
  	/* do not support NG16 due to spec D4.0 changes subcarrier idx */
-@@ -1185,7 +1195,8 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
+@@ -1186,7 +1196,8 @@ mt7996_init_eht_caps(struct mt7996_phy *phy, enum nl80211_band band,
  		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMER |
  		IEEE80211_EHT_PHY_CAP0_SU_BEAMFORMEE;
  
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0007-wifi-mt76-mt7992-adjust-beamform-mcu-cmd-configurati.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0006-wifi-mt76-mt7992-adjust-beamform-mcu-cmd-configurati.patch
similarity index 87%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0007-wifi-mt76-mt7992-adjust-beamform-mcu-cmd-configurati.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0006-wifi-mt76-mt7992-adjust-beamform-mcu-cmd-configurati.patch
index 6608130..71d5c18 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0007-wifi-mt76-mt7992-adjust-beamform-mcu-cmd-configurati.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0006-wifi-mt76-mt7992-adjust-beamform-mcu-cmd-configurati.patch
@@ -1,7 +1,7 @@
-From e4f7c4696b0701162b5bef4bf699b13313f9c9f5 Mon Sep 17 00:00:00 2001
+From c1b7d01908e071446fe7971fa3675dd335deb712 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Mon, 18 Mar 2024 11:13:56 +0800
-Subject: [PATCH 007/116] wifi: mt76: mt7992: adjust beamform mcu cmd
+Subject: [PATCH 006/115] wifi: mt76: mt7992: adjust beamform mcu cmd
  configuration for mt7992
 
 Adjust the correct beamform mcu cmd configuration for mt7992 chipsets.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0008-mtk-wifi-mt76-mt7996-add-preamble-puncture-support-f.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0007-mtk-wifi-mt76-mt7996-add-preamble-puncture-support-f.patch
similarity index 93%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0008-mtk-wifi-mt76-mt7996-add-preamble-puncture-support-f.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0007-mtk-wifi-mt76-mt7996-add-preamble-puncture-support-f.patch
index 8a29fda..145b39f 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0008-mtk-wifi-mt76-mt7996-add-preamble-puncture-support-f.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0007-mtk-wifi-mt76-mt7996-add-preamble-puncture-support-f.patch
@@ -1,7 +1,7 @@
-From f8092ef14eb9b03588ea29ac1b5a3a023f34c705 Mon Sep 17 00:00:00 2001
+From c9b1eaf95b55c51296f59142bf80b65de8c31860 Mon Sep 17 00:00:00 2001
 From: Allen Ye <allen.ye@mediatek.com>
 Date: Thu, 18 Apr 2024 11:16:24 +0800
-Subject: [PATCH 008/116] mtk: wifi: mt76: mt7996: add preamble puncture
+Subject: [PATCH 007/115] mtk: wifi: mt76: mt7996: add preamble puncture
  support for mt7996
 
 Add support configure preamble puncture feature through mcu commands.
@@ -19,7 +19,7 @@
  6 files changed, 61 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 915eb3a..1e187a8 100644
+index 6873ce1..cd604ef 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1273,6 +1273,7 @@ enum {
@@ -31,10 +31,10 @@
  	MCU_UNI_CMD_RRO = 0x57,
  	MCU_UNI_CMD_OFFCH_SCAN_CTRL = 0x58,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index ab9445c..afe8a0a 100644
+index 7d8d1e7..36cd487 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -387,6 +387,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -388,6 +388,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER);
@@ -43,7 +43,7 @@
  	if (!mdev->dev->of_node ||
  	    !of_property_read_bool(mdev->dev->of_node,
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 40ccfdc..1791335 100644
+index 7c97140..25da01f 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -411,6 +411,11 @@ static int mt7996_config(struct ieee80211_hw *hw, u32 changed)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0009-mtk-wifi-mt76-mt7996-add-driver-support-for-wpa3-ocv.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0008-mtk-wifi-mt76-mt7996-add-driver-support-for-wpa3-ocv.patch
similarity index 77%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0009-mtk-wifi-mt76-mt7996-add-driver-support-for-wpa3-ocv.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0008-mtk-wifi-mt76-mt7996-add-driver-support-for-wpa3-ocv.patch
index 93ab989..c5d26f5 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0009-mtk-wifi-mt76-mt7996-add-driver-support-for-wpa3-ocv.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0008-mtk-wifi-mt76-mt7996-add-driver-support-for-wpa3-ocv.patch
@@ -1,7 +1,7 @@
-From f0e002bc52cfc5fe8d32fe647baef94920d212d6 Mon Sep 17 00:00:00 2001
+From 4c75f5e4850d392fde3a71ac5728b83958d2aebb Mon Sep 17 00:00:00 2001
 From: mtk23510 <rudra.shahi@mediatek.com>
 Date: Fri, 24 Mar 2023 19:18:53 +0800
-Subject: [PATCH 009/116] mtk: wifi: mt76: mt7996: add driver support for wpa3
+Subject: [PATCH 008/115] mtk: wifi: mt76: mt7996: add driver support for wpa3
  ocv and bp mt76
 
 Signed-off-by: mtk23510 <rudra.shahi@mediatek.com>
@@ -10,10 +10,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index afe8a0a..ab2e17e 100644
+index 36cd487..4c6edf6 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -389,6 +389,8 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -390,6 +390,8 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_PUNCT);
  
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0010-mtk-wifi-mt76-mt7996-enable-ser-query.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0009-mtk-wifi-mt76-mt7996-enable-ser-query.patch
similarity index 83%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0010-mtk-wifi-mt76-mt7996-enable-ser-query.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0009-mtk-wifi-mt76-mt7996-enable-ser-query.patch
index 1ac9d59..efeead0 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0010-mtk-wifi-mt76-mt7996-enable-ser-query.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0009-mtk-wifi-mt76-mt7996-enable-ser-query.patch
@@ -1,7 +1,7 @@
-From 55c395dcb6ab95671cc0830e31b71c3aa8fa91c5 Mon Sep 17 00:00:00 2001
+From 0acaa3c9ba05bd0e3211a7457c96a19a6fb673c6 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 30 Oct 2023 20:19:41 +0800
-Subject: [PATCH 010/116] mtk: wifi: mt76: mt7996: enable ser query
+Subject: [PATCH 009/115] mtk: wifi: mt76: mt7996: enable ser query
 
 Do not return -EINVAL when action is UNI_CMD_SER_QUERY for user
 to dump SER information from FW.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0011-mtk-wifi-mt76-mt7996-set-key-flag-IEEE80211_KEY_FLAG.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0010-mtk-wifi-mt76-mt7996-set-key-flag-IEEE80211_KEY_FLAG.patch
similarity index 88%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0011-mtk-wifi-mt76-mt7996-set-key-flag-IEEE80211_KEY_FLAG.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0010-mtk-wifi-mt76-mt7996-set-key-flag-IEEE80211_KEY_FLAG.patch
index ca8e083..13f6857 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0011-mtk-wifi-mt76-mt7996-set-key-flag-IEEE80211_KEY_FLAG.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0010-mtk-wifi-mt76-mt7996-set-key-flag-IEEE80211_KEY_FLAG.patch
@@ -1,7 +1,7 @@
-From df056f10532395d83a9bdb199ff609817840dfab Mon Sep 17 00:00:00 2001
+From c80f83f8a40bdea586a3a65286fd07008a55ea63 Mon Sep 17 00:00:00 2001
 From: Michael-CY Lee <michael-cy.lee@mediatek.com>
 Date: Thu, 18 Apr 2024 17:21:22 +0800
-Subject: [PATCH 011/116] mtk: wifi: mt76: mt7996: set key flag
+Subject: [PATCH 010/115] mtk: wifi: mt76: mt7996: set key flag
  'IEEE80211_KEY_FLAG_GENERATE_MMIE' for other ciphers
 
 When beacon protection is enabled, FW checks MMIE tag & length in the
@@ -15,7 +15,7 @@
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 1791335..dc8014e 100644
+index 25da01f..b1593be 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -360,14 +360,14 @@ static int mt7996_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0012-mtk-wifi-mt76-mt7996-Fix-TGax-HE-4.51.1_24G-fail.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0011-mtk-wifi-mt76-mt7996-Fix-TGax-HE-4.51.1_24G-fail.patch
similarity index 84%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0012-mtk-wifi-mt76-mt7996-Fix-TGax-HE-4.51.1_24G-fail.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0011-mtk-wifi-mt76-mt7996-Fix-TGax-HE-4.51.1_24G-fail.patch
index 3f105a8..a09b403 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0012-mtk-wifi-mt76-mt7996-Fix-TGax-HE-4.51.1_24G-fail.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0011-mtk-wifi-mt76-mt7996-Fix-TGax-HE-4.51.1_24G-fail.patch
@@ -1,7 +1,7 @@
-From 6992fbb2128d9df358760e654a7797b3f89efcb9 Mon Sep 17 00:00:00 2001
+From b4759c481450099062870473e124510fc0ab4177 Mon Sep 17 00:00:00 2001
 From: mtk27745 <rex.lu@mediatek.com>
 Date: Fri, 17 Nov 2023 11:01:04 +0800
-Subject: [PATCH 012/116] mtk: wifi: mt76: mt7996: Fix TGax HE-4.51.1_24G fail
+Subject: [PATCH 011/115] mtk: wifi: mt76: mt7996: Fix TGax HE-4.51.1_24G fail
 
 According to sta capability to decide to enable/disable wed pao when create ppe entry.
 without this patch, TGax HE-4.51.1_24G will test fail
@@ -12,7 +12,7 @@
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index dc8014e..0e8abe7 100644
+index b1593be..5e50ee9 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -1463,7 +1463,12 @@ mt7996_net_fill_forward_path(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0013-mtk-wifi-mt76-mt7996-add-support-for-different-varia.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0012-mtk-wifi-mt76-mt7996-add-support-for-different-varia.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0013-mtk-wifi-mt76-mt7996-add-support-for-different-varia.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0012-mtk-wifi-mt76-mt7996-add-support-for-different-varia.patch
index 4f690df..a5d4637 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0013-mtk-wifi-mt76-mt7996-add-support-for-different-varia.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0012-mtk-wifi-mt76-mt7996-add-support-for-different-varia.patch
@@ -1,7 +1,7 @@
-From f269d62b33ba484c31db69d71b9ebcac8e2fc094 Mon Sep 17 00:00:00 2001
+From d62dc0706527fda2fa0fcb215bf7258ea073c602 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 20 Jul 2023 17:27:22 +0800
-Subject: [PATCH 013/116] mtk: wifi: mt76: mt7996: add support for different
+Subject: [PATCH 012/115] mtk: wifi: mt76: mt7996: add support for different
  variants
 
 Add fem type (2i5i, 2i5e, 2e5e, ...)
@@ -121,10 +121,10 @@
  #define MT_EE_WIFI_CONF1_TX_PATH_BAND0		GENMASK(5, 3)
  #define MT_EE_WIFI_CONF2_TX_PATH_BAND1		GENMASK(2, 0)
 diff --git a/mt7996/init.c b/mt7996/init.c
-index ab2e17e..d58335a 100644
+index 4c6edf6..08d87e8 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -885,6 +885,65 @@ out:
+@@ -886,6 +886,65 @@ out:
  #endif
  }
  
@@ -190,7 +190,7 @@
  static int mt7996_init_hardware(struct mt7996_dev *dev)
  {
  	int ret, idx;
-@@ -900,6 +959,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
+@@ -901,6 +960,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
  	INIT_LIST_HEAD(&dev->wed_rro.poll_list);
  	spin_lock_init(&dev->wed_rro.lock);
  
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0014-mtk-wifi-mt76-mt7996-ACS-channel-time-too-long-on-du.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0013-mtk-wifi-mt76-mt7996-ACS-channel-time-too-long-on-du.patch
similarity index 92%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0014-mtk-wifi-mt76-mt7996-ACS-channel-time-too-long-on-du.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0013-mtk-wifi-mt76-mt7996-ACS-channel-time-too-long-on-du.patch
index 6bcf893..9a1b4e0 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0014-mtk-wifi-mt76-mt7996-ACS-channel-time-too-long-on-du.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0013-mtk-wifi-mt76-mt7996-ACS-channel-time-too-long-on-du.patch
@@ -1,7 +1,7 @@
-From d2d45d00e7644e62f366203a17924f0e2025853a Mon Sep 17 00:00:00 2001
+From 312d53d6263229d84b4ea31bd75f6c62dcde79bb Mon Sep 17 00:00:00 2001
 From: "fancy.liu" <fancy.liu@mediatek.com>
 Date: Tue, 14 Nov 2023 10:13:24 +0800
-Subject: [PATCH 014/116] mtk: wifi: mt76: mt7996: ACS channel time too long on
+Subject: [PATCH 013/115] mtk: wifi: mt76: mt7996: ACS channel time too long on
  duty channel
 
 Step and issue:
@@ -43,7 +43,7 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index e4675bf..d291caa 100644
+index 94e85ed..aee6f1e 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -928,6 +928,7 @@ void mt76_set_channel(struct mt76_phy *phy)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0015-mtk-wifi-mt76-mt7996-Fixed-null-pointer-dereference-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0014-mtk-wifi-mt76-mt7996-Fixed-null-pointer-dereference-.patch
similarity index 88%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0015-mtk-wifi-mt76-mt7996-Fixed-null-pointer-dereference-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0014-mtk-wifi-mt76-mt7996-Fixed-null-pointer-dereference-.patch
index a029391..382ad6f 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0015-mtk-wifi-mt76-mt7996-Fixed-null-pointer-dereference-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0014-mtk-wifi-mt76-mt7996-Fixed-null-pointer-dereference-.patch
@@ -1,7 +1,7 @@
-From c8d653d2b80ec1d58e9efd947196ee9d0fbf871b Mon Sep 17 00:00:00 2001
+From 7bc825961140af52be86a1aadd9db676c9dc7cb5 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Thu, 26 Oct 2023 10:08:10 +0800
-Subject: [PATCH 015/116] mtk: wifi: mt76: mt7996: Fixed null pointer
+Subject: [PATCH 014/115] mtk: wifi: mt76: mt7996: Fixed null pointer
  dereference issue
 
 Without this patch, when the station is still in Authentication stage and
@@ -17,7 +17,7 @@
  1 file changed, 7 insertions(+)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 0e8abe7..e66c607 100644
+index 5e50ee9..0a32c3d 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -1079,9 +1079,16 @@ static void mt7996_sta_rc_update(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0016-mtk-wifi-mt76-add-sanity-check-to-prevent-kernel-cra.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0015-mtk-wifi-mt76-add-sanity-check-to-prevent-kernel-cra.patch
similarity index 87%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0016-mtk-wifi-mt76-add-sanity-check-to-prevent-kernel-cra.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0015-mtk-wifi-mt76-add-sanity-check-to-prevent-kernel-cra.patch
index ebca1e8..60f5470 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0016-mtk-wifi-mt76-add-sanity-check-to-prevent-kernel-cra.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0015-mtk-wifi-mt76-add-sanity-check-to-prevent-kernel-cra.patch
@@ -1,7 +1,7 @@
-From cfac6751faf2d57e1d02c44984f220b770ac6cf3 Mon Sep 17 00:00:00 2001
+From 161b2265936d9f6384d9481095bc5f90ff544ff8 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 30 Oct 2023 11:06:19 +0800
-Subject: [PATCH 016/116] mtk: wifi: mt76: add sanity check to prevent kernel
+Subject: [PATCH 015/115] mtk: wifi: mt76: add sanity check to prevent kernel
  crash
 
 wcid may not be initialized when mac80211 calls mt76.tx and it would lead to
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0017-mtk-wifi-mt76-mt7996-add-firmware-WA-s-coredump.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0016-mtk-wifi-mt76-mt7996-add-firmware-WA-s-coredump.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0017-mtk-wifi-mt76-mt7996-add-firmware-WA-s-coredump.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0016-mtk-wifi-mt76-mt7996-add-firmware-WA-s-coredump.patch
index 7ab6d8f..0766a09 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0017-mtk-wifi-mt76-mt7996-add-firmware-WA-s-coredump.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0016-mtk-wifi-mt76-mt7996-add-firmware-WA-s-coredump.patch
@@ -1,7 +1,7 @@
-From 06ea431d801676bc203ee274503cdb876abcf73c Mon Sep 17 00:00:00 2001
+From 92c9203ffa77791aad49246e99fd4fdce7d11041 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Fri, 19 May 2023 14:16:50 +0800
-Subject: [PATCH 017/116] mtk: wifi: mt76: mt7996: add firmware WA's coredump.
+Subject: [PATCH 016/115] mtk: wifi: mt76: mt7996: add firmware WA's coredump.
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0018-mtk-wifi-mt76-mt7996-for-build-pass.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0017-mtk-wifi-mt76-mt7996-for-build-pass.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0018-mtk-wifi-mt76-mt7996-for-build-pass.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0017-mtk-wifi-mt76-mt7996-for-build-pass.patch
index 001f887..be28893 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0018-mtk-wifi-mt76-mt7996-for-build-pass.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0017-mtk-wifi-mt76-mt7996-for-build-pass.patch
@@ -1,7 +1,7 @@
-From e3182cb0870f1d702a01deecdf62493832ab4fd9 Mon Sep 17 00:00:00 2001
+From f8a7afa48f7920a5a6c433a8de85bc59ce9af194 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 3 Nov 2022 00:27:17 +0800
-Subject: [PATCH 018/116] mtk: wifi: mt76: mt7996: for build pass
+Subject: [PATCH 017/115] mtk: wifi: mt76: mt7996: for build pass
 
 ---
  debugfs.c         | 3 +++
@@ -69,7 +69,7 @@
  static bool prefer_offload_fw = true;
  module_param(prefer_offload_fw, bool, 0644);
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index b35acf8..1e34e0a 100644
+index 162c57f..7bf8d44 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -4,6 +4,7 @@
@@ -81,7 +81,7 @@
  int mt76_connac_mcu_start_firmware(struct mt76_dev *dev, u32 addr, u32 option)
  {
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index fc194e0..363ea0e 100644
+index 18ba20c..bf3080b 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -6,6 +6,7 @@
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0019-mtk-wifi-mt76-mt7996-add-debug-tool.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0018-mtk-wifi-mt76-mt7996-add-debug-tool.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0019-mtk-wifi-mt76-mt7996-add-debug-tool.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0018-mtk-wifi-mt76-mt7996-add-debug-tool.patch
index e6aae93..1f0f79d 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0019-mtk-wifi-mt76-mt7996-add-debug-tool.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0018-mtk-wifi-mt76-mt7996-add-debug-tool.patch
@@ -1,7 +1,7 @@
-From fe15bfb3335bcbdf95fed1563646d84154607b42 Mon Sep 17 00:00:00 2001
+From 56b02d59431f7c1ba2a317d160f39cbaaf23721e Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Fri, 24 Mar 2023 14:02:32 +0800
-Subject: [PATCH 019/116] mtk: wifi: mt76: mt7996: add debug tool
+Subject: [PATCH 018/115] mtk: wifi: mt76: mt7996: add debug tool
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 
@@ -83,7 +83,7 @@
  create mode 100644 mt7996/mtk_mcu.h
 
 diff --git a/mt76.h b/mt76.h
-index 7f3ec40..b421a98 100644
+index 7dd59db..a29664c 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -399,6 +399,8 @@ struct mt76_txwi_cache {
@@ -3095,7 +3095,7 @@
 +		[MT7996_FEM_MIX] = "mixed FEM",
 +	};
 +
-+	seq_printf(s, "Version: 4.3.24.5\n");
++	seq_printf(s, "Version: 4.3.24.7\n");
 +
 +	if (!test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state))
 +		return 0;
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0020-mtk-wifi-mt76-mt7996-add-check-for-hostapd-config-he.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0019-mtk-wifi-mt76-mt7996-add-check-for-hostapd-config-he.patch
similarity index 93%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0020-mtk-wifi-mt76-mt7996-add-check-for-hostapd-config-he.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0019-mtk-wifi-mt76-mt7996-add-check-for-hostapd-config-he.patch
index f02a3eb..8e610f7 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0020-mtk-wifi-mt76-mt7996-add-check-for-hostapd-config-he.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0019-mtk-wifi-mt76-mt7996-add-check-for-hostapd-config-he.patch
@@ -1,7 +1,7 @@
-From 4974096ee9b3e3a6083da610ce13dde3b82608c9 Mon Sep 17 00:00:00 2001
+From 871fff8d7b073a67af0a70eb3809e17584c7bcec Mon Sep 17 00:00:00 2001
 From: "Allen.Ye" <allen.ye@mediatek.com>
 Date: Thu, 8 Jun 2023 17:32:33 +0800
-Subject: [PATCH 020/116] mtk: wifi: mt76: mt7996: add check for hostapd config
+Subject: [PATCH 019/115] mtk: wifi: mt76: mt7996: add check for hostapd config
  he_ldpc
 
 Add check for hostapd config he_ldpc.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0021-mtk-wifi-mt76-testmode-add-basic-testmode-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0020-mtk-wifi-mt76-testmode-add-basic-testmode-support.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0021-mtk-wifi-mt76-testmode-add-basic-testmode-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0020-mtk-wifi-mt76-testmode-add-basic-testmode-support.patch
index 19ea968..c482977 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0021-mtk-wifi-mt76-testmode-add-basic-testmode-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0020-mtk-wifi-mt76-testmode-add-basic-testmode-support.patch
@@ -1,7 +1,7 @@
-From 501b857b081c10d3400c8b4374db346b238d3f72 Mon Sep 17 00:00:00 2001
+From daaafd45086e50e5c627e61897932afe0c294e41 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 28 Dec 2022 22:24:25 +0800
-Subject: [PATCH 021/116] mtk: wifi: mt76: testmode: add basic testmode support
+Subject: [PATCH 020/115] mtk: wifi: mt76: testmode: add basic testmode support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 
@@ -62,7 +62,7 @@
  
  out_put_node:
 diff --git a/mac80211.c b/mac80211.c
-index d291caa..9a1eb47 100644
+index aee6f1e..bb7826f 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -846,7 +846,8 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)
@@ -76,7 +76,7 @@
  		if (status->flag & RX_FLAG_FAILED_FCS_CRC)
  			phy->test.rx_stats.fcs_error[q]++;
 diff --git a/mt76.h b/mt76.h
-index b421a98..57b75fa 100644
+index a29664c..5de561f 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -700,14 +700,21 @@ struct mt76_testmode_ops {
@@ -160,7 +160,7 @@
  {
  #ifdef CONFIG_NL80211_TESTMODE
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 1e187a8..0b9c6c5 100644
+index cd604ef..87db830 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1269,12 +1269,14 @@ enum {
@@ -281,10 +281,10 @@
  	MT_EE_RATE_DELTA_2G =	0x1400,
  	MT_EE_RATE_DELTA_5G =	0x147d,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index d58335a..440e26d 100644
+index 08d87e8..d3919fd 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -969,6 +969,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
+@@ -970,6 +970,10 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
  
  	set_bit(MT76_STATE_INITIALIZED, &dev->mphy.state);
  
@@ -321,7 +321,7 @@
  
  	if (!status->wcid || !ieee80211_is_data_qos(fc) || hw_aggr)
 diff --git a/mt7996/main.c b/mt7996/main.c
-index e66c607..50c7f07 100644
+index 0a32c3d..c54b604 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -23,6 +23,18 @@ static bool mt7996_dev_running(struct mt7996_dev *dev)
@@ -377,7 +377,7 @@
  		ret = mt7996_mcu_set_pp_en(phy, PP_USR_MODE,
  					   phy->mt76->chandef.punctured);
  		if (ret)
-@@ -1523,6 +1548,8 @@ const struct ieee80211_ops mt7996_ops = {
+@@ -1527,6 +1552,8 @@ const struct ieee80211_ops mt7996_ops = {
  	.sta_set_decap_offload = mt7996_sta_set_decap_offload,
  	.add_twt_setup = mt7996_mac_add_twt_setup,
  	.twt_teardown_request = mt7996_twt_teardown_request,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0022-mtk-wifi-mt76-testmode-add-testmode-pre-calibration-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0021-mtk-wifi-mt76-testmode-add-testmode-pre-calibration-.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0022-mtk-wifi-mt76-testmode-add-testmode-pre-calibration-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0021-mtk-wifi-mt76-testmode-add-testmode-pre-calibration-.patch
index 27a6593..56c1499 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0022-mtk-wifi-mt76-testmode-add-testmode-pre-calibration-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0021-mtk-wifi-mt76-testmode-add-testmode-pre-calibration-.patch
@@ -1,7 +1,7 @@
-From 19f055d29f67eb3ace29ccb6400a6bd59da8af7e Mon Sep 17 00:00:00 2001
+From fced03e07be9adb94250f2d628ff707fd07647cb Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 31 Mar 2023 11:27:24 +0800
-Subject: [PATCH 022/116] mtk: wifi: mt76: testmode: add testmode
+Subject: [PATCH 021/115] mtk: wifi: mt76: testmode: add testmode
  pre-calibration support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -21,7 +21,7 @@
  12 files changed, 632 insertions(+), 23 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 9a1eb47..e2ff011 100644
+index bb7826f..7a8fad5 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -6,27 +6,6 @@
@@ -53,7 +53,7 @@
  	CHAN2G(1, 2412),
  	CHAN2G(2, 2417),
 diff --git a/mt76.h b/mt76.h
-index 57b75fa..c591f67 100644
+index 5de561f..6a0ff06 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -23,6 +23,27 @@
@@ -93,7 +93,7 @@
  
  #define MT_TM_FW_RX_COUNT	BIT(0)
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 0b9c6c5..1919325 100644
+index 87db830..8b56f91 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1043,8 +1043,10 @@ enum {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-wifi-mt76-mt7996-add-normal-mode-pre-calibration.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0022-mtk-wifi-mt76-mt7996-add-normal-mode-pre-calibration.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-wifi-mt76-mt7996-add-normal-mode-pre-calibration.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0022-mtk-wifi-mt76-mt7996-add-normal-mode-pre-calibration.patch
index 7c11685..f8d1313 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-wifi-mt76-mt7996-add-normal-mode-pre-calibration.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0022-mtk-wifi-mt76-mt7996-add-normal-mode-pre-calibration.patch
@@ -1,7 +1,7 @@
-From 51626ab22252946790a178fd0751bd7616fc2d99 Mon Sep 17 00:00:00 2001
+From fdc6dc4705d3f85b2ffe4b145f82abf0edde3855 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 1 Mar 2023 12:12:51 +0800
-Subject: [PATCH 023/116] mtk: wifi: mt76: mt7996: add normal mode
+Subject: [PATCH 022/115] mtk: wifi: mt76: mt7996: add normal mode
  pre-calibration support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -16,7 +16,7 @@
  7 files changed, 188 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 1919325..8202ebb 100644
+index 8b56f91..d5d37d2 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1279,6 +1279,7 @@ enum {
@@ -56,10 +56,10 @@
  
  #define MT_EE_WIFI_CONF0_TX_PATH		GENMASK(2, 0)
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 440e26d..201daf1 100644
+index d3919fd..8fd8400 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -985,6 +985,12 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
+@@ -986,6 +986,12 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
  	if (ret < 0)
  		return ret;
  
@@ -73,7 +73,7 @@
  	idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7996_WTBL_STA);
  	if (idx)
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 50c7f07..89d5a17 100644
+index c54b604..d58f362 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -317,6 +317,12 @@ int mt7996_set_channel(struct mt7996_phy *phy)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0024-mtk-wifi-mt76-mt7996-enable-SCS-feature-for-mt7996-d.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-wifi-mt76-mt7996-enable-SCS-feature-for-mt7996-d.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0024-mtk-wifi-mt76-mt7996-enable-SCS-feature-for-mt7996-d.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-wifi-mt76-mt7996-enable-SCS-feature-for-mt7996-d.patch
index d318959..8cc3f2e 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0024-mtk-wifi-mt76-mt7996-enable-SCS-feature-for-mt7996-d.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0023-mtk-wifi-mt76-mt7996-enable-SCS-feature-for-mt7996-d.patch
@@ -1,7 +1,7 @@
-From db1c305572e6eba5df01d52472e027cb9ef745c6 Mon Sep 17 00:00:00 2001
+From bd52eefef6b46eb3d32bb7ffb1b34b2fe6c231ff Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Mon, 8 May 2023 09:03:50 +0800
-Subject: [PATCH 024/116] mtk: wifi: mt76: mt7996: enable SCS feature for
+Subject: [PATCH 023/115] mtk: wifi: mt76: mt7996: enable SCS feature for
  mt7996 driver
 
 Enable Smart Carrier Sense algorithn by default to improve performance
@@ -20,7 +20,7 @@
  8 files changed, 148 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 8202ebb..49c5ba3 100644
+index d5d37d2..85c8dc7 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1264,6 +1264,7 @@ enum {
@@ -32,7 +32,7 @@
  	MCU_UNI_CMD_SET_DBDC_PARMS = 0x28,
  	MCU_UNI_CMD_TXPOWER = 0x2b,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 201daf1..6a394c3 100644
+index 8fd8400..2d04ab5 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
 @@ -1415,6 +1415,7 @@ int mt7996_register_device(struct mt7996_dev *dev)
@@ -64,7 +64,7 @@
  
  void mt7996_mac_reset_work(struct work_struct *work)
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 89d5a17..eb213f8 100644
+index d58f362..a7061a7 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -81,11 +81,17 @@ int mt7996_run(struct ieee80211_hw *hw)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0025-mtk-wifi-mt76-mt7996-add-txpower-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0024-mtk-wifi-mt76-mt7996-add-txpower-support.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0025-mtk-wifi-mt76-mt7996-add-txpower-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0024-mtk-wifi-mt76-mt7996-add-txpower-support.patch
index eb2c6e8..8ecdc3d 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0025-mtk-wifi-mt76-mt7996-add-txpower-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0024-mtk-wifi-mt76-mt7996-add-txpower-support.patch
@@ -1,7 +1,7 @@
-From 186a919f2ff018e53c1e1bc9e015b409525e7273 Mon Sep 17 00:00:00 2001
+From b991703b4e7e2924100e05ac773192408c43f353 Mon Sep 17 00:00:00 2001
 From: Allen Ye <allen.ye@mediatek.com>
 Date: Fri, 24 Mar 2023 23:35:30 +0800
-Subject: [PATCH 025/116] mtk: wifi: mt76: mt7996: add txpower support
+Subject: [PATCH 024/115] mtk: wifi: mt76: mt7996: add txpower support
 
 Add single sku and default enable sku.
 
@@ -140,7 +140,7 @@
  	return max_power;
  }
 diff --git a/mt76.h b/mt76.h
-index c591f67..c372e78 100644
+index 6a0ff06..3794145 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -1059,6 +1059,14 @@ struct mt76_power_limits {
@@ -165,9 +165,9 @@
 +			      struct mt76_power_path_limits *dest_path,
  			      s8 target_power);
  
- static inline bool mt76_queue_is_wed_tx_free(struct mt76_queue *q)
+ static inline bool mt76_queue_is_rx(struct mt76_dev *dev, struct mt76_queue *q)
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 1e34e0a..0c7b693 100644
+index 7bf8d44..40cae9f 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -2150,7 +2150,7 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy,
@@ -273,10 +273,10 @@
 +
  #endif
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 6a394c3..f1d6817 100644
+index 2d04ab5..011fc90 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -295,7 +295,12 @@ static void __mt7996_init_txpower(struct mt7996_phy *phy,
+@@ -296,7 +296,12 @@ static void __mt7996_init_txpower(struct mt7996_phy *phy,
  	int nss_delta = mt76_tx_power_nss_delta(nss);
  	int pwr_delta = mt7996_eeprom_get_power_delta(dev, sband->band);
  	struct mt76_power_limits limits;
@@ -289,7 +289,7 @@
  	for (i = 0; i < sband->n_channels; i++) {
  		struct ieee80211_channel *chan = &sband->channels[i];
  		int target_power = mt7996_eeprom_get_target_power(dev, chan);
-@@ -303,11 +308,18 @@ static void __mt7996_init_txpower(struct mt7996_phy *phy,
+@@ -304,11 +309,18 @@ static void __mt7996_init_txpower(struct mt7996_phy *phy,
  		target_power += pwr_delta;
  		target_power = mt76_get_rate_power_limits(phy->mt76, chan,
  							  &limits,
@@ -311,7 +311,7 @@
  	}
  }
 diff --git a/mt7996/main.c b/mt7996/main.c
-index eb213f8..46e3e5a 100644
+index a7061a7..40ab592 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -85,6 +85,21 @@ int mt7996_run(struct ieee80211_hw *hw)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0026-mtk-wifi-mt76-mt7996-add-binfile-mode-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0025-mtk-wifi-mt76-mt7996-add-binfile-mode-support.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0026-mtk-wifi-mt76-mt7996-add-binfile-mode-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0025-mtk-wifi-mt76-mt7996-add-binfile-mode-support.patch
index 00b9fc6..f02ee43 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0026-mtk-wifi-mt76-mt7996-add-binfile-mode-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0025-mtk-wifi-mt76-mt7996-add-binfile-mode-support.patch
@@ -1,7 +1,7 @@
-From 5e960ddb3cd014c0fe80526215319ffd3c497054 Mon Sep 17 00:00:00 2001
+From 07d793bec76048d52aceb3d4ed1b5caf46ed40a6 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 31 Mar 2023 11:36:34 +0800
-Subject: [PATCH 026/116] mtk: wifi: mt76: mt7996: add binfile mode support
+Subject: [PATCH 025/115] mtk: wifi: mt76: mt7996: add binfile mode support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 
@@ -61,7 +61,7 @@
  mt76_eeprom_override(struct mt76_phy *phy)
  {
 diff --git a/mt76.h b/mt76.h
-index c372e78..dbd8ab9 100644
+index 3794145..2058ac9 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -954,6 +954,8 @@ struct mt76_dev {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0027-mtk-wifi-mt76-testmode-add-testmode-ZWDFS-verificati.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0026-mtk-wifi-mt76-testmode-add-testmode-ZWDFS-verificati.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0027-mtk-wifi-mt76-testmode-add-testmode-ZWDFS-verificati.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0026-mtk-wifi-mt76-testmode-add-testmode-ZWDFS-verificati.patch
index 5ccf77e..ca67a86 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0027-mtk-wifi-mt76-testmode-add-testmode-ZWDFS-verificati.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0026-mtk-wifi-mt76-testmode-add-testmode-ZWDFS-verificati.patch
@@ -1,7 +1,7 @@
-From 2ef29df1bbd84d7b35b6830025323cead3681e85 Mon Sep 17 00:00:00 2001
+From 464d35b2df2e79f9806aa5e25d409b59db572fad Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 22 Mar 2023 11:19:52 +0800
-Subject: [PATCH 027/116] mtk: wifi: mt76: testmode: add testmode ZWDFS
+Subject: [PATCH 026/115] mtk: wifi: mt76: testmode: add testmode ZWDFS
  verification support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -15,7 +15,7 @@
  6 files changed, 326 insertions(+), 12 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index dbd8ab9..43e4585 100644
+index 2058ac9..44b8650 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -783,6 +783,14 @@ struct mt76_testmode_data {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0028-mtk-wifi-mt76-mt7996-support-eagle-ZWDFS-on-iFEM.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0027-mtk-wifi-mt76-mt7996-support-eagle-ZWDFS-on-iFEM.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0028-mtk-wifi-mt76-mt7996-support-eagle-ZWDFS-on-iFEM.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0027-mtk-wifi-mt76-mt7996-support-eagle-ZWDFS-on-iFEM.patch
index 3cbb987..92c3e93 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0028-mtk-wifi-mt76-mt7996-support-eagle-ZWDFS-on-iFEM.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0027-mtk-wifi-mt76-mt7996-support-eagle-ZWDFS-on-iFEM.patch
@@ -1,7 +1,7 @@
-From 1be3480176150329dd571219f69ccd8efa312daa Mon Sep 17 00:00:00 2001
+From 7d8c8ebcbbe97c4ebcc0133a7d803b5524d025ca Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 5 Jul 2023 10:00:17 +0800
-Subject: [PATCH 028/116] mtk: wifi: mt76: mt7996: support eagle ZWDFS on iFEM
+Subject: [PATCH 027/115] mtk: wifi: mt76: mt7996: support eagle ZWDFS on iFEM
 
 Fix the case that control channel is not first chan during first
 interface setup.
@@ -15,7 +15,7 @@
  3 files changed, 67 insertions(+), 5 deletions(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 46e3e5a..61396a8 100644
+index 40ab592..51f932d 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -1444,6 +1444,61 @@ mt7996_twt_teardown_request(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0029-mtk-wifi-mt76-mt7996-refactor-eeprom-loading-flow-fo.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0028-mtk-wifi-mt76-mt7996-refactor-eeprom-loading-flow-fo.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0029-mtk-wifi-mt76-mt7996-refactor-eeprom-loading-flow-fo.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0028-mtk-wifi-mt76-mt7996-refactor-eeprom-loading-flow-fo.patch
index 786d7e6..5e22192 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0029-mtk-wifi-mt76-mt7996-refactor-eeprom-loading-flow-fo.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0028-mtk-wifi-mt76-mt7996-refactor-eeprom-loading-flow-fo.patch
@@ -1,7 +1,7 @@
-From 1ed0aea054ae9fcd011f81333888d15cba7fc19f Mon Sep 17 00:00:00 2001
+From 4ae7689cfda607ffe6b5eab8c77dbc50a29f6f9b Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Mon, 11 Mar 2024 10:43:03 +0800
-Subject: [PATCH 029/116] mtk: wifi: mt76: mt7996: refactor eeprom loading flow
+Subject: [PATCH 028/115] mtk: wifi: mt76: mt7996: refactor eeprom loading flow
  for sku checking
 
 Add eeprom sku checking mechanism to avoid using the
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0030-mtk-wifi-mt76-mt7996-add-vendor-commands-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0029-mtk-wifi-mt76-mt7996-add-vendor-commands-support.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0030-mtk-wifi-mt76-mt7996-add-vendor-commands-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0029-mtk-wifi-mt76-mt7996-add-vendor-commands-support.patch
index c5c7739..1cd761f 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0030-mtk-wifi-mt76-mt7996-add-vendor-commands-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0029-mtk-wifi-mt76-mt7996-add-vendor-commands-support.patch
@@ -1,7 +1,7 @@
-From 952ed39c596363be421fab82fc8dc9043a6d6b01 Mon Sep 17 00:00:00 2001
+From cc64fe3c68c1cab1f9229c30004c6431ea482d4e Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Tue, 13 Dec 2022 15:17:43 +0800
-Subject: [PATCH 030/116] mtk: wifi: mt76: mt7996: add vendor commands support
+Subject: [PATCH 029/115] mtk: wifi: mt76: mt7996: add vendor commands support
 
 mtk: wifi: mt76: fix muru_onoff as all enabled by default
 
@@ -57,7 +57,7 @@
  create mode 100644 mt7996/vendor.h
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 49c5ba3..750bb93 100644
+index 85c8dc7..b2b72fa 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1254,6 +1254,7 @@ enum {
@@ -95,10 +95,10 @@
  mt7996e-$(CONFIG_DEV_COREDUMP) += coredump.o
  mt7996e-$(CONFIG_NL80211_TESTMODE) += testmode.o
 diff --git a/mt7996/init.c b/mt7996/init.c
-index f1d6817..5cc2e6f 100644
+index 011fc90..e893bb6 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -378,6 +378,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -379,6 +379,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  
  	phy->slottime = 9;
  	phy->beacon_rate = -1;
@@ -106,7 +106,7 @@
  
  	hw->sta_data_size = sizeof(struct mt7996_sta);
  	hw->vif_data_size = sizeof(struct mt7996_vif);
-@@ -629,6 +630,10 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -630,6 +631,10 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  	if (ret)
  		goto error;
  
@@ -144,7 +144,7 @@
  		status->flag |= RX_FLAG_8023;
  		mt7996_wed_check_ppe(dev, &dev->mt76.q_rx[q], msta, skb,
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 61396a8..003bf3f 100644
+index 51f932d..c9df253 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -760,6 +760,10 @@ int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0031-mtk-wifi-mt76-mt7996-add-debugfs-for-fw-coredump.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0030-mtk-wifi-mt76-mt7996-add-debugfs-for-fw-coredump.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0031-mtk-wifi-mt76-mt7996-add-debugfs-for-fw-coredump.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0030-mtk-wifi-mt76-mt7996-add-debugfs-for-fw-coredump.patch
index 0adbbdc..3290655 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0031-mtk-wifi-mt76-mt7996-add-debugfs-for-fw-coredump.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0030-mtk-wifi-mt76-mt7996-add-debugfs-for-fw-coredump.patch
@@ -1,7 +1,7 @@
-From 2b301b7df0e6aeb725683bbee25027787488b147 Mon Sep 17 00:00:00 2001
+From 1f1c2b9e312c11524a7b81be022ee626a0111c27 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Fri, 19 May 2023 14:56:07 +0800
-Subject: [PATCH 031/116] mtk: wifi: mt76: mt7996: add debugfs for fw coredump.
+Subject: [PATCH 030/115] mtk: wifi: mt76: mt7996: add debugfs for fw coredump.
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0032-mtk-wifi-mt76-mt7996-Add-mt7992-coredump-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0031-mtk-wifi-mt76-mt7996-Add-mt7992-coredump-support.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0032-mtk-wifi-mt76-mt7996-Add-mt7992-coredump-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0031-mtk-wifi-mt76-mt7996-Add-mt7992-coredump-support.patch
index 20f82a0..00ac2c9 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0032-mtk-wifi-mt76-mt7996-Add-mt7992-coredump-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0031-mtk-wifi-mt76-mt7996-Add-mt7992-coredump-support.patch
@@ -1,7 +1,7 @@
-From 2df50005330ec03e1316a25e0cb3b6ece5915d13 Mon Sep 17 00:00:00 2001
+From e9754aab55bd3a89a45b3002b3d4ea993626ecfd Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Mon, 25 Dec 2023 15:17:49 +0800
-Subject: [PATCH 032/116] mtk: wifi: mt76: mt7996: Add mt7992 coredump support
+Subject: [PATCH 031/115] mtk: wifi: mt76: mt7996: Add mt7992 coredump support
 
 1. Add mt7992 coredump support
 2. fixed if new ic have not support coredump, it may cause crash when remove module
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0033-mtk-wifi-mt76-mt7996-add-support-for-runtime-set-in-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0032-mtk-wifi-mt76-mt7996-add-support-for-runtime-set-in-.patch
similarity index 91%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0033-mtk-wifi-mt76-mt7996-add-support-for-runtime-set-in-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0032-mtk-wifi-mt76-mt7996-add-support-for-runtime-set-in-.patch
index 94ad572..4511096 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0033-mtk-wifi-mt76-mt7996-add-support-for-runtime-set-in-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0032-mtk-wifi-mt76-mt7996-add-support-for-runtime-set-in-.patch
@@ -1,7 +1,7 @@
-From 6fd185872dc77c7ca2f13237937269bb8f2af706 Mon Sep 17 00:00:00 2001
+From bb99f72896720eb27900d3d00fad11873919984a Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Tue, 6 Jun 2023 16:57:10 +0800
-Subject: [PATCH 033/116] mtk: wifi: mt76: mt7996: add support for runtime set
+Subject: [PATCH 032/115] mtk: wifi: mt76: mt7996: add support for runtime set
  in-band discovery
 
 with this patch, AP can runtime set inband discovery via hostapd_cli
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0034-mtk-wifi-mt76-mt7996-add-support-spatial-reuse-debug.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0033-mtk-wifi-mt76-mt7996-add-support-spatial-reuse-debug.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0034-mtk-wifi-mt76-mt7996-add-support-spatial-reuse-debug.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0033-mtk-wifi-mt76-mt7996-add-support-spatial-reuse-debug.patch
index 9c80261..33c701f 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0034-mtk-wifi-mt76-mt7996-add-support-spatial-reuse-debug.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0033-mtk-wifi-mt76-mt7996-add-support-spatial-reuse-debug.patch
@@ -1,7 +1,7 @@
-From 5e5d779286a2c289480469f3b6d1b93479a4762c Mon Sep 17 00:00:00 2001
+From 31aaebfc29f7fbe030e057fbde088461c53d1cb8 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Mon, 10 Jul 2023 11:47:29 +0800
-Subject: [PATCH 034/116] mtk: wifi: mt76: mt7996: add support spatial reuse
+Subject: [PATCH 033/115] mtk: wifi: mt76: mt7996: add support spatial reuse
  debug commands
 
 This commit adds the following debug commands in debugfs:
@@ -26,7 +26,7 @@
  7 files changed, 270 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 750bb93..7f2daf7 100644
+index b2b72fa..9afa17e 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1041,6 +1041,7 @@ enum {
@@ -38,7 +38,7 @@
  	MCU_UNI_EVENT_TX_DONE = 0x2d,
  	MCU_UNI_EVENT_BF = 0x33,
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 003bf3f..92b2834 100644
+index c9df253..4372657 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -6,6 +6,9 @@
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0035-mtk-wifi-mt76-mt7996-Establish-BA-in-VO-queue.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0034-mtk-wifi-mt76-mt7996-Establish-BA-in-VO-queue.patch
similarity index 80%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0035-mtk-wifi-mt76-mt7996-Establish-BA-in-VO-queue.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0034-mtk-wifi-mt76-mt7996-Establish-BA-in-VO-queue.patch
index 1103857..30d69ca 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0035-mtk-wifi-mt76-mt7996-Establish-BA-in-VO-queue.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0034-mtk-wifi-mt76-mt7996-Establish-BA-in-VO-queue.patch
@@ -1,7 +1,7 @@
-From e6c2efee109792cf81fa79a0b0bf56fdbc1f4787 Mon Sep 17 00:00:00 2001
+From 2a4fe7832a83cf0185ffab227489ccef00aeb270 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Tue, 1 Aug 2023 16:02:28 +0800
-Subject: [PATCH 035/116] mtk: wifi: mt76: mt7996: Establish BA in VO queue
+Subject: [PATCH 034/115] mtk: wifi: mt76: mt7996: Establish BA in VO queue
 
 ---
  mt7996/mac.c | 2 --
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0036-mtk-wifi-mt76-mt7996-report-tx-and-rx-byte-to-tpt_le.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0035-mtk-wifi-mt76-mt7996-report-tx-and-rx-byte-to-tpt_le.patch
similarity index 90%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0036-mtk-wifi-mt76-mt7996-report-tx-and-rx-byte-to-tpt_le.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0035-mtk-wifi-mt76-mt7996-report-tx-and-rx-byte-to-tpt_le.patch
index e58ed5b..3950860 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0036-mtk-wifi-mt76-mt7996-report-tx-and-rx-byte-to-tpt_le.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0035-mtk-wifi-mt76-mt7996-report-tx-and-rx-byte-to-tpt_le.patch
@@ -1,7 +1,7 @@
-From fdad308b7db267d46e7dc1e22f251797c9cbd79e Mon Sep 17 00:00:00 2001
+From d5c3653593f3e27523009c0d679a9b1d3a859b64 Mon Sep 17 00:00:00 2001
 From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
 Date: Sat, 12 Aug 2023 04:17:22 +0800
-Subject: [PATCH 036/116] mtk: wifi: mt76: mt7996: report tx and rx byte to
+Subject: [PATCH 035/115] mtk: wifi: mt76: mt7996: report tx and rx byte to
  tpt_led
 
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0037-mtk-wifi-mt76-mt7996-support-dup-wtbl.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0036-mtk-wifi-mt76-mt7996-support-dup-wtbl.patch
similarity index 89%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0037-mtk-wifi-mt76-mt7996-support-dup-wtbl.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0036-mtk-wifi-mt76-mt7996-support-dup-wtbl.patch
index 77e8fb5..62dc96e 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0037-mtk-wifi-mt76-mt7996-support-dup-wtbl.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0036-mtk-wifi-mt76-mt7996-support-dup-wtbl.patch
@@ -1,7 +1,7 @@
-From a0f3047d8ba9040f39a14a202b7369efe223dd9e Mon Sep 17 00:00:00 2001
+From 45596e422b5c01576f7de7739a3e62d4633cfdac Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 21 Sep 2023 00:52:46 +0800
-Subject: [PATCH 037/116] mtk: wifi: mt76: mt7996: support dup wtbl
+Subject: [PATCH 036/115] mtk: wifi: mt76: mt7996: support dup wtbl
 
 Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
 ---
@@ -11,10 +11,10 @@
  3 files changed, 25 insertions(+)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 5cc2e6f..d4b0a72 100644
+index e893bb6..dd56e68 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -686,6 +686,7 @@ static void mt7996_init_work(struct work_struct *work)
+@@ -687,6 +687,7 @@ static void mt7996_init_work(struct work_struct *work)
  	mt7996_mcu_set_eeprom(dev);
  	mt7996_mac_init(dev);
  	mt7996_txbf_init(dev);
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0038-mtk-wifi-mt76-try-more-times-when-send-message-timeo.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0037-mtk-wifi-mt76-try-more-times-when-send-message-timeo.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0038-mtk-wifi-mt76-try-more-times-when-send-message-timeo.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0037-mtk-wifi-mt76-try-more-times-when-send-message-timeo.patch
index 937ae0c..e86505d 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0038-mtk-wifi-mt76-try-more-times-when-send-message-timeo.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0037-mtk-wifi-mt76-try-more-times-when-send-message-timeo.patch
@@ -1,7 +1,7 @@
-From 3cc26e708dbef9b1eb0b5466a073a9c5c8a613b9 Mon Sep 17 00:00:00 2001
+From ff3f825816e96f9748285616f729283e17ef5f28 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Mon, 6 Nov 2023 11:10:10 +0800
-Subject: [PATCH 038/116] mtk: wifi: mt76: try more times when send message
+Subject: [PATCH 037/115] mtk: wifi: mt76: try more times when send message
  timeout.
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0039-mtk-wifi-mt76-mt7996-add-SER-overlap-handle.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0038-mtk-wifi-mt76-mt7996-add-SER-overlap-handle.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0039-mtk-wifi-mt76-mt7996-add-SER-overlap-handle.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0038-mtk-wifi-mt76-mt7996-add-SER-overlap-handle.patch
index ab691e1..39f8f5b 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0039-mtk-wifi-mt76-mt7996-add-SER-overlap-handle.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0038-mtk-wifi-mt76-mt7996-add-SER-overlap-handle.patch
@@ -1,7 +1,7 @@
-From 5759eb68a8453f211699bb09d74a39dd9e8d4c02 Mon Sep 17 00:00:00 2001
+From c1e14faca4e6faf2d4ac4efac965224f8a6a8cf3 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Tue, 21 Nov 2023 09:55:46 +0800
-Subject: [PATCH 039/116] mtk: wifi: mt76: mt7996: add SER overlap handle
+Subject: [PATCH 038/115] mtk: wifi: mt76: mt7996: add SER overlap handle
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0040-mtk-wifi-mt76-mt7996-kite-default-1-pcie-setting.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0039-mtk-wifi-mt76-mt7996-kite-default-1-pcie-setting.patch
similarity index 90%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0040-mtk-wifi-mt76-mt7996-kite-default-1-pcie-setting.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0039-mtk-wifi-mt76-mt7996-kite-default-1-pcie-setting.patch
index 2bb7510..ac45783 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0040-mtk-wifi-mt76-mt7996-kite-default-1-pcie-setting.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0039-mtk-wifi-mt76-mt7996-kite-default-1-pcie-setting.patch
@@ -1,7 +1,7 @@
-From 9d16189b29de2e3c2fb0daf7fe5238f489b26818 Mon Sep 17 00:00:00 2001
+From 81c23a3c365e5f3c0b3729d9dcad6a875cfd7c50 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 13 Jul 2023 16:36:36 +0800
-Subject: [PATCH 040/116] mtk: wifi: mt76: mt7996: kite default 1-pcie setting
+Subject: [PATCH 039/115] mtk: wifi: mt76: mt7996: kite default 1-pcie setting
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0041-mtk-wifi-mt76-mt7996-add-debugfs-knob-for-rx_counter.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0040-mtk-wifi-mt76-mt7996-add-debugfs-knob-for-rx_counter.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0041-mtk-wifi-mt76-mt7996-add-debugfs-knob-for-rx_counter.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0040-mtk-wifi-mt76-mt7996-add-debugfs-knob-for-rx_counter.patch
index 6b2abc6..98f22c7 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0041-mtk-wifi-mt76-mt7996-add-debugfs-knob-for-rx_counter.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0040-mtk-wifi-mt76-mt7996-add-debugfs-knob-for-rx_counter.patch
@@ -1,7 +1,7 @@
-From 9e924043388155d6e27199f90755a282d4b13126 Mon Sep 17 00:00:00 2001
+From 07dd9f135d51cc56d97c8d9b2afdd70c8979c833 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Fri, 28 Apr 2023 10:39:58 +0800
-Subject: [PATCH 041/116] mtk: wifi: mt76: mt7996: add debugfs knob for
+Subject: [PATCH 040/115] mtk: wifi: mt76: mt7996: add debugfs knob for
  rx_counters
 
 Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
@@ -72,7 +72,7 @@
  	spin_lock_init(&tid->lock);
  
 diff --git a/mac80211.c b/mac80211.c
-index e2ff011..93e5c50 100644
+index 7a8fad5..6c6635f 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -784,6 +784,7 @@ static void mt76_rx_release_amsdu(struct mt76_phy *phy, enum mt76_rxq_id q)
@@ -131,7 +131,7 @@
  		napi_gro_receive(napi, skb);
  	}
 diff --git a/mt76.h b/mt76.h
-index 43e4585..0cc6e53 100644
+index 44b8650..1a3a27c 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -428,6 +428,7 @@ struct mt76_rx_tid {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0042-mtk-wifi-mt76-mt7996-support-BF-MIMO-debug-commands.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0041-mtk-wifi-mt76-mt7996-support-BF-MIMO-debug-commands.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0042-mtk-wifi-mt76-mt7996-support-BF-MIMO-debug-commands.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0041-mtk-wifi-mt76-mt7996-support-BF-MIMO-debug-commands.patch
index 55a47be..8b9d0b3 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0042-mtk-wifi-mt76-mt7996-support-BF-MIMO-debug-commands.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0041-mtk-wifi-mt76-mt7996-support-BF-MIMO-debug-commands.patch
@@ -1,7 +1,7 @@
-From 8ffdd68c3265dbb716322ccfb0a8c0e230616335 Mon Sep 17 00:00:00 2001
+From 91683e85426f1b2fc53cfe1bb7cb3fe44e3a2dd8 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 3 Jan 2023 09:42:07 +0800
-Subject: [PATCH 042/116] mtk: wifi: mt76: mt7996: support BF/MIMO debug
+Subject: [PATCH 041/115] mtk: wifi: mt76: mt7996: support BF/MIMO debug
  commands
 
 This commit includes the following commands:
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0043-mtk-wifi-mt76-mt7996-add-build-the-following-MURU-mc.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0042-mtk-wifi-mt76-mt7996-add-build-the-following-MURU-mc.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0043-mtk-wifi-mt76-mt7996-add-build-the-following-MURU-mc.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0042-mtk-wifi-mt76-mt7996-add-build-the-following-MURU-mc.patch
index 4064983..1806ae3 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0043-mtk-wifi-mt76-mt7996-add-build-the-following-MURU-mc.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0042-mtk-wifi-mt76-mt7996-add-build-the-following-MURU-mc.patch
@@ -1,7 +1,7 @@
-From 786203d2878c468d179ec324c9d91b331e09e16a Mon Sep 17 00:00:00 2001
+From 7d47f079b9397894fc379a278aaefbe085ba59ce Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 13 Jun 2023 14:49:02 +0800
-Subject: [PATCH 043/116] mtk: wifi: mt76: mt7996: add build the following MURU
+Subject: [PATCH 042/115] mtk: wifi: mt76: mt7996: add build the following MURU
  mcu command tlvs
 
 It includes the following tlvs:
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0044-mtk-wifi-mt76-mt7996-add-cert-patch.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0043-mtk-wifi-mt76-mt7996-add-cert-patch.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0044-mtk-wifi-mt76-mt7996-add-cert-patch.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0043-mtk-wifi-mt76-mt7996-add-cert-patch.patch
index cdb3a91..ef1c648 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0044-mtk-wifi-mt76-mt7996-add-cert-patch.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0043-mtk-wifi-mt76-mt7996-add-cert-patch.patch
@@ -1,7 +1,7 @@
-From c9230b110a7c2db2d8863499d7a1d72b9fc74cad Mon Sep 17 00:00:00 2001
+From af302a5d1b176e2f04495e19f389ed1df7ada304 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Mon, 14 Aug 2023 13:36:58 +0800
-Subject: [PATCH 044/116] mtk: wifi: mt76: mt7996: add cert patch
+Subject: [PATCH 043/115] mtk: wifi: mt76: mt7996: add cert patch
 
 This patch includes TGac and TGax
 
@@ -50,7 +50,7 @@
  {
  	struct mt7996_dev *dev = container_of(work, struct mt7996_dev, rc_work);
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 92b2834..8e67616 100644
+index 4372657..2be3ad4 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -613,6 +613,7 @@ mt7996_get_rates_table(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-wifi-mt76-testmode-add-testmode-bf-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0044-mtk-wifi-mt76-testmode-add-testmode-bf-support.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-wifi-mt76-testmode-add-testmode-bf-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0044-mtk-wifi-mt76-testmode-add-testmode-bf-support.patch
index fc0ff2e..05a1f05 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-wifi-mt76-testmode-add-testmode-bf-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0044-mtk-wifi-mt76-testmode-add-testmode-bf-support.patch
@@ -1,7 +1,7 @@
-From 822d3687ba4c131b1850a06116ee39e5ebc3767c Mon Sep 17 00:00:00 2001
+From 5e23ce4f62981d0b7ca3d40085638a332500d3f8 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 6 Apr 2023 16:40:28 +0800
-Subject: [PATCH 045/116] mtk: wifi: mt76: testmode: add testmode bf support
+Subject: [PATCH 044/115] mtk: wifi: mt76: testmode: add testmode bf support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 
@@ -44,7 +44,7 @@
  14 files changed, 1576 insertions(+), 59 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 0cc6e53..8b17dfb 100644
+index 1a3a27c..e710abf 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -757,6 +757,11 @@ struct mt76_testmode_data {
@@ -60,7 +60,7 @@
  	bool ebf;
  
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 7f2daf7..61a14a8 100644
+index 9afa17e..c782caa 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -488,7 +488,8 @@ struct sta_rec_bf {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0046-mtk-wifi-mt76-mt7996-add-zwdfs-cert-mode.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-wifi-mt76-mt7996-add-zwdfs-cert-mode.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0046-mtk-wifi-mt76-mt7996-add-zwdfs-cert-mode.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-wifi-mt76-mt7996-add-zwdfs-cert-mode.patch
index 9088f6e..f4168cf 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0046-mtk-wifi-mt76-mt7996-add-zwdfs-cert-mode.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0045-mtk-wifi-mt76-mt7996-add-zwdfs-cert-mode.patch
@@ -1,7 +1,7 @@
-From f0bff585456e12c9b5e5b0e5cc33bf920d8cb6d0 Mon Sep 17 00:00:00 2001
+From 04772c00f375b4fd187c5806fb70a96aeaea234b Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 22 Sep 2023 12:33:06 +0800
-Subject: [PATCH 046/116] mtk: wifi: mt76: mt7996: add zwdfs cert mode
+Subject: [PATCH 045/115] mtk: wifi: mt76: mt7996: add zwdfs cert mode
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0047-mtk-wifi-mt76-testmode-add-channel-68-96.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0046-mtk-wifi-mt76-testmode-add-channel-68-96.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0047-mtk-wifi-mt76-testmode-add-channel-68-96.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0046-mtk-wifi-mt76-testmode-add-channel-68-96.patch
index 309f186..0107aa3 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0047-mtk-wifi-mt76-testmode-add-channel-68-96.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0046-mtk-wifi-mt76-testmode-add-channel-68-96.patch
@@ -1,7 +1,7 @@
-From 2904eb321441ee487d4438fdc46efe3d8032e74f Mon Sep 17 00:00:00 2001
+From 5ffc6ad5d6b296c77c7325c8b336ad6aad632199 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Mon, 11 Sep 2023 14:43:07 +0800
-Subject: [PATCH 047/116] mtk: wifi: mt76: testmode: add channel 68 & 96
+Subject: [PATCH 046/115] mtk: wifi: mt76: testmode: add channel 68 & 96
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 
@@ -24,7 +24,7 @@
  6 files changed, 82 insertions(+), 9 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 93e5c50..de0a398 100644
+index 6c6635f..f33c772 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -34,6 +34,15 @@ static const struct ieee80211_channel mt76_channels_5ghz[] = {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0048-mtk-wifi-mt76-testmode-add-kite-testmode-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0047-mtk-wifi-mt76-testmode-add-kite-testmode-support.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0048-mtk-wifi-mt76-testmode-add-kite-testmode-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0047-mtk-wifi-mt76-testmode-add-kite-testmode-support.patch
index ef91f55..94b2e7e 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0048-mtk-wifi-mt76-testmode-add-kite-testmode-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0047-mtk-wifi-mt76-testmode-add-kite-testmode-support.patch
@@ -1,7 +1,7 @@
-From 85865dc300bbe3bc8ef98907a145e8a9875858af Mon Sep 17 00:00:00 2001
+From b1be137cb083694de5ef852aac26c444c859fdc9 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 12 Oct 2023 16:17:33 +0800
-Subject: [PATCH 048/116] mtk: wifi: mt76: testmode: add kite testmode support
+Subject: [PATCH 047/115] mtk: wifi: mt76: testmode: add kite testmode support
 
 Add Kite testmode support
 1. avoid entering connac 2 testmode flow in kite
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0049-mtk-wifi-mt76-mt7996-assign-DEAUTH-to-ALTX-queue-for.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0048-mtk-wifi-mt76-mt7996-assign-DEAUTH-to-ALTX-queue-for.patch
similarity index 91%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0049-mtk-wifi-mt76-mt7996-assign-DEAUTH-to-ALTX-queue-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0048-mtk-wifi-mt76-mt7996-assign-DEAUTH-to-ALTX-queue-for.patch
index 5145ced..bdf52de 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0049-mtk-wifi-mt76-mt7996-assign-DEAUTH-to-ALTX-queue-for.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0048-mtk-wifi-mt76-mt7996-assign-DEAUTH-to-ALTX-queue-for.patch
@@ -1,7 +1,7 @@
-From 6eb483091a4f12b40d201fb2a896a0499ea41100 Mon Sep 17 00:00:00 2001
+From 30b8fd07d74c106a59a9ee0097d28ce77e8fa71c Mon Sep 17 00:00:00 2001
 From: Michael-CY Lee <michael-cy.lee@mediatek.com>
 Date: Tue, 14 Nov 2023 11:27:06 +0800
-Subject: [PATCH 049/116] mtk: wifi: mt76: mt7996: assign DEAUTH to ALTX queue
+Subject: [PATCH 048/115] mtk: wifi: mt76: mt7996: assign DEAUTH to ALTX queue
  for CERT
 
 Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0050-mtk-wifi-mt76-mt7996-add-no_beacon-vendor-command-fo.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0049-mtk-wifi-mt76-mt7996-add-no_beacon-vendor-command-fo.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0050-mtk-wifi-mt76-mt7996-add-no_beacon-vendor-command-fo.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0049-mtk-wifi-mt76-mt7996-add-no_beacon-vendor-command-fo.patch
index bc472fd..2158baf 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0050-mtk-wifi-mt76-mt7996-add-no_beacon-vendor-command-fo.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0049-mtk-wifi-mt76-mt7996-add-no_beacon-vendor-command-fo.patch
@@ -1,7 +1,7 @@
-From 2fadd891ed50fdb0ba643748abec7d576ff65945 Mon Sep 17 00:00:00 2001
+From 07b65416936237b1986a094dd23063b767a2cefb Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Wed, 22 Nov 2023 22:42:09 +0800
-Subject: [PATCH 050/116] mtk: wifi: mt76: mt7996: add no_beacon vendor command
+Subject: [PATCH 049/115] mtk: wifi: mt76: mt7996: add no_beacon vendor command
  for cert
 
 Add the vendor command to disable/enable beacon
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0051-mtk-wifi-mt76-mt7996-add-adie-efuse-merge-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0050-mtk-wifi-mt76-mt7996-add-adie-efuse-merge-support.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0051-mtk-wifi-mt76-mt7996-add-adie-efuse-merge-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0050-mtk-wifi-mt76-mt7996-add-adie-efuse-merge-support.patch
index 4403909..262778c 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0051-mtk-wifi-mt76-mt7996-add-adie-efuse-merge-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0050-mtk-wifi-mt76-mt7996-add-adie-efuse-merge-support.patch
@@ -1,7 +1,7 @@
-From 571a367ee2ab7e447b7126bb05f778ec4ffdb3d0 Mon Sep 17 00:00:00 2001
+From ef0a37aa11ff407cce4ed9230d81944993251c3b Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 24 Nov 2023 09:49:08 +0800
-Subject: [PATCH 051/116] mtk: wifi: mt76: mt7996: add adie efuse merge support
+Subject: [PATCH 050/115] mtk: wifi: mt76: mt7996: add adie efuse merge support
 
 Merge adie-dependent parameters in efuse into eeprom after FT.
 Note that Eagle BE14000 is not considered yet.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0052-mtk-wifi-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0051-mtk-wifi-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0052-mtk-wifi-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0051-mtk-wifi-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
index 1ab4d7d..c1ab30c 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0052-mtk-wifi-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0051-mtk-wifi-mt7996-add-Eagle-2adie-TBTC-BE14000-support.patch
@@ -1,7 +1,7 @@
-From eafc607f276a54844224670c0fff6b92ebe5af09 Mon Sep 17 00:00:00 2001
+From c8c493248b7db6724f3187ddb99281d01e8b2b6d Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Tue, 5 Dec 2023 16:48:33 +0800
-Subject: [PATCH 052/116] mtk: wifi: mt7996: add Eagle 2adie TBTC (BE14000)
+Subject: [PATCH 051/115] mtk: wifi: mt7996: add Eagle 2adie TBTC (BE14000)
  support
 
 Add fwdl/default eeprom load support for Eagle 2 adie TBTC
@@ -85,10 +85,10 @@
  static const u32 mt7992_prek_rev[] = {
  	[GROUP_SIZE_2G] =			4 * MT_EE_CAL_UNIT,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index d4b0a72..cb00322 100644
+index dd56e68..29412e5 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -916,6 +916,12 @@ int mt7996_get_chip_sku(struct mt7996_dev *dev)
+@@ -917,6 +917,12 @@ int mt7996_get_chip_sku(struct mt7996_dev *dev)
  
  	switch (mt76_chip(&dev->mt76)) {
  	case 0x7990:
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0053-mtk-wifi-mt76-mt7996-add-background-radar-hw-cap-che.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0052-mtk-wifi-mt76-mt7996-add-background-radar-hw-cap-che.patch
similarity index 90%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0053-mtk-wifi-mt76-mt7996-add-background-radar-hw-cap-che.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0052-mtk-wifi-mt76-mt7996-add-background-radar-hw-cap-che.patch
index 12d06e6..212f411 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0053-mtk-wifi-mt76-mt7996-add-background-radar-hw-cap-che.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0052-mtk-wifi-mt76-mt7996-add-background-radar-hw-cap-che.patch
@@ -1,7 +1,7 @@
-From 189d4baa960d2202e518c3e15c9959524cafc3d0 Mon Sep 17 00:00:00 2001
+From 7857bb925e01f26c1ff1423d22078415b48d21c7 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 22 Dec 2023 17:27:10 +0800
-Subject: [PATCH 053/116] mtk: wifi: mt76: mt7996: add background radar hw cap
+Subject: [PATCH 052/115] mtk: wifi: mt76: mt7996: add background radar hw cap
  check
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -28,10 +28,10 @@
  		ret = -EINVAL;
  		goto out;
 diff --git a/mt7996/init.c b/mt7996/init.c
-index cb00322..6430bfa 100644
+index 29412e5..5aa6bf5 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -404,9 +404,10 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -405,9 +405,10 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_PROTECTION);
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0054-mtk-wifi-mt76-mt7996-add-fallback-in-case-of-missing.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0053-mtk-wifi-mt76-mt7996-add-fallback-in-case-of-missing.patch
similarity index 90%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0054-mtk-wifi-mt76-mt7996-add-fallback-in-case-of-missing.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0053-mtk-wifi-mt76-mt7996-add-fallback-in-case-of-missing.patch
index 35eafe9..775dd63 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0054-mtk-wifi-mt76-mt7996-add-fallback-in-case-of-missing.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0053-mtk-wifi-mt76-mt7996-add-fallback-in-case-of-missing.patch
@@ -1,7 +1,7 @@
-From 60ed10d23382fef314766291e997d422ef9d9fd5 Mon Sep 17 00:00:00 2001
+From 4a55b12b274e8c5629d039cbbb5fa6dbbcb78688 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Tue, 19 Mar 2024 17:33:49 +0800
-Subject: [PATCH 054/116] mtk: wifi: mt76: mt7996: add fallback in case of
+Subject: [PATCH 053/115] mtk: wifi: mt76: mt7996: add fallback in case of
  missing precal data
 
 Align Wi-Fi 6 upstream changes
@@ -68,10 +68,10 @@
  	ret = mt7996_apply_cal_free_data(dev);
  	if (ret)
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 6430bfa..c10f667 100644
+index 5aa6bf5..1c731fc 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -1010,7 +1010,7 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
+@@ -1011,7 +1011,7 @@ static int mt7996_init_hardware(struct mt7996_dev *dev)
  	if (ret < 0)
  		return ret;
  
@@ -81,7 +81,7 @@
  		if (ret)
  			return ret;
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 8e67616..c7cc66e 100644
+index 2be3ad4..b11e3a4 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -345,7 +345,7 @@ int mt7996_set_channel(struct mt7996_phy *phy)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0055-mtk-wifi-mt76-mt7996-add-kite-part-number-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0054-mtk-wifi-mt76-mt7996-add-kite-part-number-support.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0055-mtk-wifi-mt76-mt7996-add-kite-part-number-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0054-mtk-wifi-mt76-mt7996-add-kite-part-number-support.patch
index 4a4a5f0..7548f86 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0055-mtk-wifi-mt76-mt7996-add-kite-part-number-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0054-mtk-wifi-mt76-mt7996-add-kite-part-number-support.patch
@@ -1,7 +1,7 @@
-From 1b54509046b166213c2e9611d6d4db9d8b42e493 Mon Sep 17 00:00:00 2001
+From d9a91ccf171aed26a34eee95d7380e1051e0a056 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 27 Mar 2024 17:50:16 +0800
-Subject: [PATCH 055/116] mtk: wifi: mt76: mt7996: add kite part number support
+Subject: [PATCH 054/115] mtk: wifi: mt76: mt7996: add kite part number support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0056-mtk-wifi-mt76-revert-page_poll-for-kernel-5.4.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0055-mtk-wifi-mt76-revert-page_poll-for-kernel-5.4.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0056-mtk-wifi-mt76-revert-page_poll-for-kernel-5.4.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0055-mtk-wifi-mt76-revert-page_poll-for-kernel-5.4.patch
index b8213cd..154eacc 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0056-mtk-wifi-mt76-revert-page_poll-for-kernel-5.4.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0055-mtk-wifi-mt76-revert-page_poll-for-kernel-5.4.patch
@@ -1,7 +1,7 @@
-From f4f100bea5c4e42cfd7f815555be0a6efc79aaba Mon Sep 17 00:00:00 2001
+From 7814c627035691fb98cc01bf196fe6c519c3bb16 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Mon, 6 Feb 2023 19:49:22 +0800
-Subject: [PATCH 056/116] mtk: wifi: mt76: revert page_poll for kernel 5.4
+Subject: [PATCH 055/115] mtk: wifi: mt76: revert page_poll for kernel 5.4
 
 This reverts commit e8c10835cf062c577ddf426913788c39d30b4bd7.
 ---
@@ -203,7 +203,7 @@
  
  	if (mtk_wed_device_active(&dev->mmio.wed))
 diff --git a/mac80211.c b/mac80211.c
-index de0a398..a050d0a 100644
+index f33c772..3375b7d 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -566,47 +566,6 @@ void mt76_unregister_phy(struct mt76_phy *phy)
@@ -277,7 +277,7 @@
  {
  	struct ieee80211_hw *hw = phy->hw;
 diff --git a/mt76.h b/mt76.h
-index 8b17dfb..fd6eab5 100644
+index e710abf..b059e26 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -251,7 +251,7 @@ struct mt76_queue {
@@ -297,7 +297,7 @@
  void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
  			 struct mt76_sta_stats *stats, bool eht);
  int mt76_skb_adjust_pad(struct sk_buff *skb, int pad);
-@@ -1752,25 +1751,6 @@ void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked);
+@@ -1764,25 +1763,6 @@ void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked);
  struct mt76_txwi_cache *mt76_rx_token_release(struct mt76_dev *dev, int token);
  int mt76_rx_token_consume(struct mt76_dev *dev, void *ptr,
  			  struct mt76_txwi_cache *r, dma_addr_t phys);
@@ -324,7 +324,7 @@
  static inline void mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked)
  {
 diff --git a/mt7915/main.c b/mt7915/main.c
-index b16a633..ad91fc3 100644
+index 2624edb..1b9ef1d 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -1402,22 +1402,19 @@ void mt7915_get_et_strings(struct ieee80211_hw *hw,
@@ -382,10 +382,10 @@
  
  static void
 diff --git a/usb.c b/usb.c
-index dc690d1..058f2d1 100644
+index 58ff068..0ca3b06 100644
 --- a/usb.c
 +++ b/usb.c
-@@ -319,27 +319,29 @@ mt76u_set_endpoints(struct usb_interface *intf,
+@@ -318,27 +318,29 @@ mt76u_set_endpoints(struct usb_interface *intf,
  
  static int
  mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
@@ -420,7 +420,7 @@
  		urb->num_sgs = i;
  	}
  
-@@ -352,16 +354,15 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
+@@ -351,16 +353,15 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
  
  static int
  mt76u_refill_rx(struct mt76_dev *dev, struct mt76_queue *q,
@@ -440,7 +440,7 @@
  
  	return urb->transfer_buffer ? 0 : -ENOMEM;
  }
-@@ -399,7 +400,7 @@ mt76u_rx_urb_alloc(struct mt76_dev *dev, struct mt76_queue *q,
+@@ -398,7 +399,7 @@ mt76u_rx_urb_alloc(struct mt76_dev *dev, struct mt76_queue *q,
  	if (err)
  		return err;
  
@@ -449,7 +449,7 @@
  }
  
  static void mt76u_urb_free(struct urb *urb)
-@@ -407,10 +408,10 @@ static void mt76u_urb_free(struct urb *urb)
+@@ -406,10 +407,10 @@ static void mt76u_urb_free(struct urb *urb)
  	int i;
  
  	for (i = 0; i < urb->num_sgs; i++)
@@ -462,7 +462,7 @@
  
  	usb_free_urb(urb);
  }
-@@ -546,8 +547,6 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb,
+@@ -545,8 +546,6 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb,
  		len -= data_len;
  		nsgs++;
  	}
@@ -471,7 +471,7 @@
  	dev->drv->rx_skb(dev, MT_RXQ_MAIN, skb, NULL);
  
  	return nsgs;
-@@ -613,7 +612,7 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
+@@ -612,7 +611,7 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
  
  		count = mt76u_process_rx_entry(dev, urb, q->buf_size);
  		if (count > 0) {
@@ -480,7 +480,7 @@
  			if (err < 0)
  				break;
  		}
-@@ -664,10 +663,6 @@ mt76u_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid)
+@@ -663,10 +662,6 @@ mt76u_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid)
  	struct mt76_queue *q = &dev->q_rx[qid];
  	int i, err;
  
@@ -491,7 +491,7 @@
  	spin_lock_init(&q->lock);
  	q->entry = devm_kcalloc(dev->dev,
  				MT_NUM_RX_ENTRIES, sizeof(*q->entry),
-@@ -696,6 +691,7 @@ EXPORT_SYMBOL_GPL(mt76u_alloc_mcu_queue);
+@@ -695,6 +690,7 @@ EXPORT_SYMBOL_GPL(mt76u_alloc_mcu_queue);
  static void
  mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
  {
@@ -499,7 +499,7 @@
  	int i;
  
  	for (i = 0; i < q->ndesc; i++) {
-@@ -705,8 +701,13 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
+@@ -704,8 +700,13 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
  		mt76u_urb_free(q->entry[i].urb);
  		q->entry[i].urb = NULL;
  	}
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0057-mtk-wifi-mt76-rework-wed-rx-flow.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0056-mtk-wifi-mt76-rework-wed-rx-flow.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0057-mtk-wifi-mt76-rework-wed-rx-flow.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0056-mtk-wifi-mt76-rework-wed-rx-flow.patch
index b8f0a0d..65e8d9b 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0057-mtk-wifi-mt76-rework-wed-rx-flow.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0056-mtk-wifi-mt76-rework-wed-rx-flow.patch
@@ -1,7 +1,7 @@
-From 9874e44657b18d1c2c225506ce9f7a985fd9b94a Mon Sep 17 00:00:00 2001
+From 1bf747e854f7a64ec6fc2c51050fe9d06bae16ed Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Mon, 6 Feb 2023 13:37:23 +0800
-Subject: [PATCH 057/116] mtk: wifi: mt76: rework wed rx flow
+Subject: [PATCH 056/115] mtk: wifi: mt76: rework wed rx flow
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
 ---
@@ -259,7 +259,7 @@
  					 DMA_FROM_DEVICE);
  			skb_free_frag(buf);
 diff --git a/mac80211.c b/mac80211.c
-index a050d0a..3c2c2af 100644
+index 3375b7d..90d8b04 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -596,7 +596,6 @@ mt76_alloc_device(struct device *pdev, unsigned int size,
@@ -279,7 +279,7 @@
  	for (i = 0; i < ARRAY_SIZE(dev->q_rx); i++)
  		skb_queue_head_init(&dev->rx_skb[i]);
 diff --git a/mt76.h b/mt76.h
-index fd6eab5..2ad5a3f 100644
+index b059e26..ecb916f 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -205,6 +205,7 @@ struct mt76_queue_entry {
@@ -339,7 +339,7 @@
  void mt76_free_pending_rxwi(struct mt76_dev *dev);
  void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,
  		      struct napi_struct *napi);
-@@ -1748,9 +1753,9 @@ struct mt76_txwi_cache *
+@@ -1760,9 +1765,9 @@ struct mt76_txwi_cache *
  mt76_token_release(struct mt76_dev *dev, int token, bool *wake);
  int mt76_token_consume(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi);
  void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked);
@@ -352,7 +352,7 @@
  static inline void mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked)
  {
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 6004d64..5938bd9 100644
+index d6ecd69..c851186 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -714,7 +714,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0058-mtk-wifi-mt76-wed-change-wed-token-init-size-to-adap.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0057-mtk-wifi-mt76-wed-change-wed-token-init-size-to-adap.patch
similarity index 87%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0058-mtk-wifi-mt76-wed-change-wed-token-init-size-to-adap.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0057-mtk-wifi-mt76-wed-change-wed-token-init-size-to-adap.patch
index 86ecb66..f131b3b 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0058-mtk-wifi-mt76-wed-change-wed-token-init-size-to-adap.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0057-mtk-wifi-mt76-wed-change-wed-token-init-size-to-adap.patch
@@ -1,7 +1,7 @@
-From e5bfc7a288ec62f00e1bb7da03646268ba1b67d2 Mon Sep 17 00:00:00 2001
+From 0fba52b0c453f93581c58a9fb22836fa10b23ce5 Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Wed, 19 Apr 2023 17:13:41 +0800
-Subject: [PATCH 058/116] mtk: wifi: mt76: wed: change wed token init size to
+Subject: [PATCH 057/115] mtk: wifi: mt76: wed: change wed token init size to
  adapt wed3.0
 
 Signed-off-by: sujuan.chen <sujuan.chen@mediatek.com>
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0059-mtk-wifi-mt76-add-random-early-drop-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0058-mtk-wifi-mt76-add-random-early-drop-support.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0059-mtk-wifi-mt76-add-random-early-drop-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0058-mtk-wifi-mt76-add-random-early-drop-support.patch
index 342f2ce..36619e4 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0059-mtk-wifi-mt76-add-random-early-drop-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0058-mtk-wifi-mt76-add-random-early-drop-support.patch
@@ -1,7 +1,7 @@
-From 4b0b49bb26433a9d8a62cd37c66fbba548d9aee7 Mon Sep 17 00:00:00 2001
+From 0d6f4162b2fb904b2659f1dc2412b9ea9b26f9c9 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Wed, 19 Apr 2023 18:32:41 +0800
-Subject: [PATCH 059/116] mtk: wifi: mt76: add random early drop support
+Subject: [PATCH 058/115] mtk: wifi: mt76: add random early drop support
 
 ---
  mt7996/debugfs.c     |  1 +
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0060-mtk-wifi-mt76-mt7996-reset-addr_elem-when-delete-ba.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0059-mtk-wifi-mt76-mt7996-reset-addr_elem-when-delete-ba.patch
similarity index 91%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0060-mtk-wifi-mt76-mt7996-reset-addr_elem-when-delete-ba.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0059-mtk-wifi-mt76-mt7996-reset-addr_elem-when-delete-ba.patch
index 96dff48..301e701 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0060-mtk-wifi-mt76-mt7996-reset-addr_elem-when-delete-ba.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0059-mtk-wifi-mt76-mt7996-reset-addr_elem-when-delete-ba.patch
@@ -1,7 +1,7 @@
-From 7328175da3d5b1a42c26d1f7fd34fe6c278d22ca Mon Sep 17 00:00:00 2001
+From 1727348670ec21d32e781a87ab419c97c4f218ba Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Thu, 18 May 2023 15:01:47 +0800
-Subject: [PATCH 060/116] mtk: wifi: mt76: mt7996: reset addr_elem when delete
+Subject: [PATCH 059/115] mtk: wifi: mt76: mt7996: reset addr_elem when delete
  ba
 
 The old addr element info may be used when the signature is not equel to
@@ -20,7 +20,7 @@
  2 files changed, 47 insertions(+)
 
 diff --git a/mt76.h b/mt76.h
-index 2ad5a3f..37ef803 100644
+index ecb916f..4798ee6 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -444,6 +444,7 @@ struct mt76_rx_tid {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0061-mtk-wifi-mt76-wed-change-pcie0-R5-to-pcie1-to-get-6G.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0060-mtk-wifi-mt76-wed-change-pcie0-R5-to-pcie1-to-get-6G.patch
similarity index 89%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0061-mtk-wifi-mt76-wed-change-pcie0-R5-to-pcie1-to-get-6G.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0060-mtk-wifi-mt76-wed-change-pcie0-R5-to-pcie1-to-get-6G.patch
index f70c00d..8297e46 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0061-mtk-wifi-mt76-wed-change-pcie0-R5-to-pcie1-to-get-6G.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0060-mtk-wifi-mt76-wed-change-pcie0-R5-to-pcie1-to-get-6G.patch
@@ -1,7 +1,7 @@
-From 51653708b92be73f1bd4a79ca11eaa3cb181ee4b Mon Sep 17 00:00:00 2001
+From b74b2f962022c856a41eb53675017056e9a2b08d Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Fri, 6 Oct 2023 14:01:41 +0800
-Subject: [PATCH 061/116] mtk: wifi: mt76: wed: change pcie0 R5 to pcie1 to get
+Subject: [PATCH 060/115] mtk: wifi: mt76: wed: change pcie0 R5 to pcie1 to get
  6G ICS
 
 ---
@@ -26,10 +26,10 @@
  				       MT_RXQ_ID(MT_RXQ_BAND2),
  				       MT7996_RX_RING_SIZE,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index c10f667..de5122f 100644
+index 1c731fc..0622194 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -649,10 +649,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -650,10 +650,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  		goto error;
  
  	if (wed == &dev->mt76.mmio.wed_hif2 && mtk_wed_device_active(wed)) {
@@ -43,7 +43,7 @@
  
  	return 0;
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index 8fe56ed..a082cca 100644
+index 928a966..7940621 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -527,12 +527,15 @@ static void mt7996_irq_tasklet(struct tasklet_struct *t)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0062-mtk-wifi-mt76-add-SER-support-for-wed3.0.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0061-mtk-wifi-mt76-add-SER-support-for-wed3.0.patch
similarity index 84%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0062-mtk-wifi-mt76-add-SER-support-for-wed3.0.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0061-mtk-wifi-mt76-add-SER-support-for-wed3.0.patch
index 9653eac..a577544 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0062-mtk-wifi-mt76-add-SER-support-for-wed3.0.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0061-mtk-wifi-mt76-add-SER-support-for-wed3.0.patch
@@ -1,7 +1,7 @@
-From a666507a58b47e007ea1396d35941598a398cdc9 Mon Sep 17 00:00:00 2001
+From fa58c4b47bb6cede82fa96ba5a7bea8db0161027 Mon Sep 17 00:00:00 2001
 From: mtk27745 <rex.lu@mediatek.com>
 Date: Tue, 23 May 2023 12:06:29 +0800
-Subject: [PATCH 062/116] mtk: wifi: mt76: add SER support for wed3.0
+Subject: [PATCH 061/115] mtk: wifi: mt76: add SER support for wed3.0
 
 ---
  dma.c         | 5 +++--
@@ -25,7 +25,7 @@
  		mt76_dma_rx_fill(dev, q, false);
  	}
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index a082cca..d29579f 100644
+index 7940621..0d25c5f 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -297,6 +297,7 @@ out:
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0063-mtk-wifi-mt76-mt7915-wed-find-rx-token-by-physical-a.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0062-mtk-wifi-mt76-mt7915-wed-find-rx-token-by-physical-a.patch
similarity index 92%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0063-mtk-wifi-mt76-mt7915-wed-find-rx-token-by-physical-a.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0062-mtk-wifi-mt76-mt7915-wed-find-rx-token-by-physical-a.patch
index e40c8a0..c03ad5a 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0063-mtk-wifi-mt76-mt7915-wed-find-rx-token-by-physical-a.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0062-mtk-wifi-mt76-mt7915-wed-find-rx-token-by-physical-a.patch
@@ -1,7 +1,7 @@
-From e9774619c3b0871df9bfcb87fb4f268e8799e0c3 Mon Sep 17 00:00:00 2001
+From 091a6dd648a37b711d6c3b7a2fe8ad1657829037 Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Wed, 19 Jul 2023 10:55:09 +0800
-Subject: [PATCH 063/116] mtk: wifi: mt76: mt7915: wed: find rx token by
+Subject: [PATCH 062/115] mtk: wifi: mt76: mt7915: wed: find rx token by
  physical address
 
 The token id in RxDMAD may be incorrect when it is not the last frame due to
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0064-mtk-wifi-mt76-mt7996-add-dma-mask-limitation.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0063-mtk-wifi-mt76-mt7996-add-dma-mask-limitation.patch
similarity index 91%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0064-mtk-wifi-mt76-mt7996-add-dma-mask-limitation.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0063-mtk-wifi-mt76-mt7996-add-dma-mask-limitation.patch
index ae66519..9f6f5cc 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0064-mtk-wifi-mt76-mt7996-add-dma-mask-limitation.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0063-mtk-wifi-mt76-mt7996-add-dma-mask-limitation.patch
@@ -1,7 +1,7 @@
-From 947f66954b1b232255697954131532b4f005e7cd Mon Sep 17 00:00:00 2001
+From 71a1c39597bcde40ecf545265ac97094afec71b4 Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Thu, 20 Jul 2023 10:25:50 +0800
-Subject: [PATCH 064/116] mtk: wifi: mt76: mt7996: add dma mask limitation
+Subject: [PATCH 063/115] mtk: wifi: mt76: mt7996: add dma mask limitation
 
 Signed-off-by: sujuan.chen <sujuan.chen@mediatek.com>
 ---
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0065-mtk-wifi-mt76-mt7996-add-per-bss-statistic-info.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0064-mtk-wifi-mt76-mt7996-add-per-bss-statistic-info.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0065-mtk-wifi-mt76-mt7996-add-per-bss-statistic-info.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0064-mtk-wifi-mt76-mt7996-add-per-bss-statistic-info.patch
index 48ed97c..6b84e26 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0065-mtk-wifi-mt76-mt7996-add-per-bss-statistic-info.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0064-mtk-wifi-mt76-mt7996-add-per-bss-statistic-info.patch
@@ -1,7 +1,7 @@
-From d86765207c6919af7c0448841f723159b0c1dcab Mon Sep 17 00:00:00 2001
+From c51cf1b46816b57512a420dac3b33492cd43a503 Mon Sep 17 00:00:00 2001
 From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
 Date: Fri, 18 Aug 2023 10:17:08 +0800
-Subject: [PATCH 065/116] mtk: wifi: mt76: mt7996: add per bss statistic info
+Subject: [PATCH 064/115] mtk: wifi: mt76: mt7996: add per bss statistic info
 
 Whenever WED is enabled, unicast traffic might run through HW path.
 As a result, we need to count them using WM event.
@@ -22,10 +22,10 @@
  3 files changed, 37 insertions(+), 5 deletions(-)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index de5122f..8b7c278 100644
+index 0622194..b486173 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -401,6 +401,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -402,6 +402,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_PUNCT);
@@ -34,7 +34,7 @@
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_OPERATING_CHANNEL_VALIDATION);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_PROTECTION);
 diff --git a/mt7996/main.c b/mt7996/main.c
-index c7cc66e..801e480 100644
+index b11e3a4..c90eb4b 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -265,6 +265,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0066-mtk-wifi-mt76-mt7996-do-not-report-netdev-stats-on-m.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0065-mtk-wifi-mt76-mt7996-do-not-report-netdev-stats-on-m.patch
similarity index 89%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0066-mtk-wifi-mt76-mt7996-do-not-report-netdev-stats-on-m.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0065-mtk-wifi-mt76-mt7996-do-not-report-netdev-stats-on-m.patch
index d86ca2c..fd497f7 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0066-mtk-wifi-mt76-mt7996-do-not-report-netdev-stats-on-m.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0065-mtk-wifi-mt76-mt7996-do-not-report-netdev-stats-on-m.patch
@@ -1,7 +1,7 @@
-From 947b71bb7b65824acf8dbaa984ead4ce638f4005 Mon Sep 17 00:00:00 2001
+From feee7afd10066885b73646d8d5f930c2ec2b7944 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 26 Oct 2023 17:27:43 +0800
-Subject: [PATCH 066/116] mtk: wifi: mt76: mt7996: do not report netdev stats
+Subject: [PATCH 065/115] mtk: wifi: mt76: mt7996: do not report netdev stats
  on monitor vif
 
 This fixes the following NULL pointer crash when enabling monitor mode:
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0067-mtk-wifi-mt76-mt7996-add-support-for-HW-ATF.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0066-mtk-wifi-mt76-mt7996-add-support-for-HW-ATF.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0067-mtk-wifi-mt76-mt7996-add-support-for-HW-ATF.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0066-mtk-wifi-mt76-mt7996-add-support-for-HW-ATF.patch
index dc84c18..a33dbae 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0067-mtk-wifi-mt76-mt7996-add-support-for-HW-ATF.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0066-mtk-wifi-mt76-mt7996-add-support-for-HW-ATF.patch
@@ -1,7 +1,7 @@
-From f5372277983af2dd7cc3416563de0ad06ff6211c Mon Sep 17 00:00:00 2001
+From fa0b9acdd7a3efefc8c8ebcab881ae585024322b Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Mon, 11 Sep 2023 16:35:15 +0800
-Subject: [PATCH 067/116] mtk: wifi: mt76: mt7996: add support for HW-ATF
+Subject: [PATCH 066/115] mtk: wifi: mt76: mt7996: add support for HW-ATF
 
 ---
  mt7996/debugfs.c |  90 ++++++++++++++++
@@ -121,10 +121,10 @@
  	if (phy->mt76->cap.has_5ghz) {
  		debugfs_create_u32("dfs_hw_pattern", 0400, dir,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 8b7c278..c382ded 100644
+index b486173..7e5eca1 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -573,6 +573,37 @@ int mt7996_txbf_init(struct mt7996_dev *dev)
+@@ -574,6 +574,37 @@ int mt7996_txbf_init(struct mt7996_dev *dev)
  	return mt7996_mcu_set_txbf(dev, BF_HW_EN_UPDATE);
  }
  
@@ -162,7 +162,7 @@
  static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  			       enum mt76_band_id band)
  {
-@@ -645,6 +676,12 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -646,6 +677,12 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  	if (ret)
  		goto error;
  
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0068-mtk-wifi-mt76-mt7996-wed-add-SER0.5-support-w-wed3.0.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0067-mtk-wifi-mt76-mt7996-wed-add-SER0.5-support-w-wed3.0.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0068-mtk-wifi-mt76-mt7996-wed-add-SER0.5-support-w-wed3.0.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0067-mtk-wifi-mt76-mt7996-wed-add-SER0.5-support-w-wed3.0.patch
index 8865ef4..9198eab 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0068-mtk-wifi-mt76-mt7996-wed-add-SER0.5-support-w-wed3.0.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0067-mtk-wifi-mt76-mt7996-wed-add-SER0.5-support-w-wed3.0.patch
@@ -1,7 +1,7 @@
-From 21fac5083443173762f0bda68768acde71e7153e Mon Sep 17 00:00:00 2001
+From 92edabeeee073819eb85561d1e2e092eb0429ecb Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Thu, 12 Oct 2023 10:04:54 +0800
-Subject: [PATCH 068/116] mtk: wifi: mt76: mt7996: wed: add SER0.5 support w/
+Subject: [PATCH 067/115] mtk: wifi: mt76: mt7996: wed: add SER0.5 support w/
  wed3.0
 
 Signed-off-by: sujuan.chen <sujuan.chen@mediatek.com>
@@ -72,7 +72,7 @@
  		mt76_wed_dma_setup(dev, q, true);
  }
 diff --git a/mt76.h b/mt76.h
-index 37ef803..9f1f7fc 100644
+index 4798ee6..f61d8c1 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -301,7 +301,7 @@ struct mt76_queue_ops {
@@ -84,7 +84,7 @@
  };
  
  enum mt76_phy_type {
-@@ -1736,8 +1736,13 @@ static inline bool mt76_queue_is_wed_rro_ind(struct mt76_queue *q)
+@@ -1748,8 +1748,13 @@ static inline bool mt76_queue_is_wed_rro_ind(struct mt76_queue *q)
  static inline bool mt76_queue_is_wed_rro_data(struct mt76_queue *q)
  {
  	return mt76_queue_is_wed_rro(q) &&
@@ -100,7 +100,7 @@
  }
  
  static inline bool mt76_queue_is_wed_rx(struct mt76_queue *q)
-@@ -1746,7 +1751,8 @@ static inline bool mt76_queue_is_wed_rx(struct mt76_queue *q)
+@@ -1758,7 +1763,8 @@ static inline bool mt76_queue_is_wed_rx(struct mt76_queue *q)
  		return false;
  
  	return FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) == MT76_WED_Q_RX ||
@@ -173,10 +173,10 @@
  	mt7996_dma_enable(dev, !force);
  }
 diff --git a/mt7996/init.c b/mt7996/init.c
-index c382ded..ff629e8 100644
+index 7e5eca1..ce61f66 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -735,11 +735,91 @@ void mt7996_wfsys_reset(struct mt7996_dev *dev)
+@@ -736,11 +736,91 @@ void mt7996_wfsys_reset(struct mt7996_dev *dev)
  	msleep(20);
  }
  
@@ -269,7 +269,7 @@
  	struct mt7996_wed_rro_addr *addr;
  	void *ptr;
  	int i;
-@@ -799,50 +879,9 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev)
+@@ -800,50 +880,9 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev)
  		addr++;
  	}
  
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0069-mtk-wifi-mt76-mt7996-support-backaward-compatiable.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0068-mtk-wifi-mt76-mt7996-support-backaward-compatiable.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0069-mtk-wifi-mt76-mt7996-support-backaward-compatiable.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0068-mtk-wifi-mt76-mt7996-support-backaward-compatiable.patch
index 8890a59..60506ea 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0069-mtk-wifi-mt76-mt7996-support-backaward-compatiable.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0068-mtk-wifi-mt76-mt7996-support-backaward-compatiable.patch
@@ -1,7 +1,7 @@
-From 099ff0e39f8f83d3d6395db232da68448392b67b Mon Sep 17 00:00:00 2001
+From dae098abd407a6cdb5d371dfe7a5db57e57f023d Mon Sep 17 00:00:00 2001
 From: mtk27745 <rex.lu@mediatek.com>
 Date: Fri, 6 Oct 2023 20:59:42 +0800
-Subject: [PATCH 069/116] mtk: wifi: mt76: mt7996: support backaward
+Subject: [PATCH 068/115] mtk: wifi: mt76: mt7996: support backaward
  compatiable
 
 revert upstream wed trigger mode to polling mode
@@ -27,7 +27,7 @@
  7 files changed, 24 insertions(+), 17 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 9f1f7fc..677f68f 100644
+index f61d8c1..698d849 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -53,6 +53,8 @@
@@ -74,7 +74,7 @@
  	return mt76_mcu_send_msg(&dev->mt76, MCU_WA_PARAM_CMD(SET),
  				 &req, sizeof(req), false);
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index d29579f..1c2cea2 100644
+index 0d25c5f..3557300 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -14,7 +14,7 @@
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0070-mtk-wifi-mt76-mt7996-wed-add-wed-support-for-mt7992.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0069-mtk-wifi-mt76-mt7996-wed-add-wed-support-for-mt7992.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0070-mtk-wifi-mt76-mt7996-wed-add-wed-support-for-mt7992.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0069-mtk-wifi-mt76-mt7996-wed-add-wed-support-for-mt7992.patch
index 2e43a51..e902cbf 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0070-mtk-wifi-mt76-mt7996-wed-add-wed-support-for-mt7992.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0069-mtk-wifi-mt76-mt7996-wed-add-wed-support-for-mt7992.patch
@@ -1,7 +1,7 @@
-From 048688dc31d7f531fc9d99d0e20820189ede9c53 Mon Sep 17 00:00:00 2001
+From 8596353e039d570e8c42796f734fd87d4327b0cf Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Fri, 8 Sep 2023 11:57:39 +0800
-Subject: [PATCH 070/116] mtk: wifi: mt76: mt7996: wed: add wed support for
+Subject: [PATCH 069/115] mtk: wifi: mt76: mt7996: wed: add wed support for
  mt7992
 
 Signed-off-by: sujuan.chen <sujuan.chen@mediatek.com>
@@ -168,10 +168,10 @@
  		if (mt7996_band_valid(dev, MT_BAND2)) {
  			/* rx rro data queue for band2 */
 diff --git a/mt7996/init.c b/mt7996/init.c
-index ff629e8..e29cebe 100644
+index ce61f66..178f247 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -813,6 +813,7 @@ void mt7996_rro_hw_init(struct mt7996_dev *dev)
+@@ -814,6 +814,7 @@ void mt7996_rro_hw_init(struct mt7996_dev *dev)
  	/* interrupt enable */
  	mt76_wr(dev, MT_RRO_HOST_INT_ENA,
  		MT_RRO_HOST_INT_ENA_HOST_RRO_DONE_ENA);
@@ -179,7 +179,7 @@
  #endif
  }
  
-@@ -865,6 +866,17 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev)
+@@ -866,6 +867,17 @@ static int mt7996_wed_rro_init(struct mt7996_dev *dev)
  			dev->wed_rro.addr_elem[i].phy_addr;
  	}
  
@@ -213,7 +213,7 @@
  					    true);
  
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index 1c2cea2..3f0692c 100644
+index 3557300..bfe92ce 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -313,7 +313,8 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0071-mtk-wifi-mt76-mt7992-wed-add-2pcie-one-wed-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0070-mtk-wifi-mt76-mt7992-wed-add-2pcie-one-wed-support.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0071-mtk-wifi-mt76-mt7992-wed-add-2pcie-one-wed-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0070-mtk-wifi-mt76-mt7992-wed-add-2pcie-one-wed-support.patch
index cb745f1..65de263 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0071-mtk-wifi-mt76-mt7992-wed-add-2pcie-one-wed-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0070-mtk-wifi-mt76-mt7992-wed-add-2pcie-one-wed-support.patch
@@ -1,7 +1,7 @@
-From 2342f41c5f878f7d419d20a46daa3b025c024b08 Mon Sep 17 00:00:00 2001
+From 38d3dc52da3b4eede95d7df20683f802c637ab06 Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Wed, 13 Sep 2023 17:35:43 +0800
-Subject: [PATCH 071/116] mtk: wifi: mt76: mt7992: wed: add 2pcie one wed
+Subject: [PATCH 070/115] mtk: wifi: mt76: mt7992: wed: add 2pcie one wed
  support
 
 Signed-off-by: sujuan.chen <sujuan.chen@mediatek.com>
@@ -55,7 +55,7 @@
  			dev->mt76.q_rx[MT_RXQ_TXFREE_BAND0].wed = wed;
  
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index 3f0692c..91567a0 100644
+index bfe92ce..4baae0e 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -375,10 +375,10 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0072-mtk-wifi-mt76-mt7996-Remove-wed-rro-ring-add-napi-at.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0071-mtk-wifi-mt76-mt7996-Remove-wed-rro-ring-add-napi-at.patch
similarity index 87%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0072-mtk-wifi-mt76-mt7996-Remove-wed-rro-ring-add-napi-at.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0071-mtk-wifi-mt76-mt7996-Remove-wed-rro-ring-add-napi-at.patch
index 759ac00..ed76e24 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0072-mtk-wifi-mt76-mt7996-Remove-wed-rro-ring-add-napi-at.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0071-mtk-wifi-mt76-mt7996-Remove-wed-rro-ring-add-napi-at.patch
@@ -1,7 +1,7 @@
-From 6701c4d78ed81ac7d04b73c213f38f2d3ba1a735 Mon Sep 17 00:00:00 2001
+From 28f469ad2e2b066d71a92bbcc5803358aedd6bea Mon Sep 17 00:00:00 2001
 From: mtk27745 <rex.lu@mediatek.com>
 Date: Mon, 6 Nov 2023 10:16:34 +0800
-Subject: [PATCH 072/116] mtk: wifi: mt76: mt7996: Remove wed rro ring add napi
+Subject: [PATCH 071/115] mtk: wifi: mt76: mt7996: Remove wed rro ring add napi
  at init state
 
 without this patch. rro ring will add napi at initial state. once rro ring add napi, it will have chance to be used by host driver. if host driver accessed the ring data, it will cause some issue.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0073-mtk-wifi-mt76-mt7996-Remove-wed_stop-during-L1-SER.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0072-mtk-wifi-mt76-mt7996-Remove-wed_stop-during-L1-SER.patch
similarity index 86%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0073-mtk-wifi-mt76-mt7996-Remove-wed_stop-during-L1-SER.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0072-mtk-wifi-mt76-mt7996-Remove-wed_stop-during-L1-SER.patch
index 4e46bfe..157f84f 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0073-mtk-wifi-mt76-mt7996-Remove-wed_stop-during-L1-SER.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0072-mtk-wifi-mt76-mt7996-Remove-wed_stop-during-L1-SER.patch
@@ -1,7 +1,7 @@
-From 86d498b85d7e85f5c75b83a39a17f744357481b7 Mon Sep 17 00:00:00 2001
+From 910a0ba0c7f3fd6a96837d7330e8e54b7c1be753 Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Wed, 29 Nov 2023 13:56:52 +0800
-Subject: [PATCH 073/116] mtk: wifi: mt76: mt7996: Remove wed_stop during L1
+Subject: [PATCH 072/115] mtk: wifi: mt76: mt7996: Remove wed_stop during L1
  SER
 
 Align logan L1 SER flow. During L1 SER, didn't need to close wed interrupt.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0074-mtk-wifi-mt76-mt7996-Refactor-rro-del-ba-command-for.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0073-mtk-wifi-mt76-mt7996-Refactor-rro-del-ba-command-for.patch
similarity index 91%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0074-mtk-wifi-mt76-mt7996-Refactor-rro-del-ba-command-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0073-mtk-wifi-mt76-mt7996-Refactor-rro-del-ba-command-for.patch
index 481382a..3c48a0a 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0074-mtk-wifi-mt76-mt7996-Refactor-rro-del-ba-command-for.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0073-mtk-wifi-mt76-mt7996-Refactor-rro-del-ba-command-for.patch
@@ -1,7 +1,7 @@
-From 319c0c7f599ca9835577ccfd91aff59af02b1999 Mon Sep 17 00:00:00 2001
+From 8679181bcd095b6ae726d840052d7e5b87476957 Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Wed, 29 Nov 2023 15:51:04 +0800
-Subject: [PATCH 074/116] mtk: wifi: mt76: mt7996: Refactor rro del ba command
+Subject: [PATCH 073/115] mtk: wifi: mt76: mt7996: Refactor rro del ba command
  format
 
 1. remove unused struct
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0075-mtk-wifi-mt76-mt7996-get-airtime-and-RSSI-via-MCU-co.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0074-mtk-wifi-mt76-mt7996-get-airtime-and-RSSI-via-MCU-co.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0075-mtk-wifi-mt76-mt7996-get-airtime-and-RSSI-via-MCU-co.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0074-mtk-wifi-mt76-mt7996-get-airtime-and-RSSI-via-MCU-co.patch
index a553070..8c2023a 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0075-mtk-wifi-mt76-mt7996-get-airtime-and-RSSI-via-MCU-co.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0074-mtk-wifi-mt76-mt7996-get-airtime-and-RSSI-via-MCU-co.patch
@@ -1,7 +1,7 @@
-From a08f12c4e90f1c849c3e8dc0db60fe294b63f3fe Mon Sep 17 00:00:00 2001
+From 2a4ef74878b50e320b77f2878be3c20042e11ec1 Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Fri, 17 Nov 2023 18:08:06 +0800
-Subject: [PATCH 075/116] mtk: wifi: mt76: mt7996: get airtime and RSSI via MCU
+Subject: [PATCH 074/115] mtk: wifi: mt76: mt7996: get airtime and RSSI via MCU
  commands
 
 Direct access to WTBL for airtime and RSSI may cause synchronization issue with FW.
@@ -23,7 +23,7 @@
  9 files changed, 361 insertions(+), 143 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 677f68f..28defd4 100644
+index 698d849..1127f9c 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -332,11 +332,15 @@ struct mt76_sta_stats {
@@ -66,7 +66,7 @@
  mtxq_to_txq(struct mt76_txq *mtxq)
  {
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 61a14a8..f389470 100644
+index c782caa..bb94035 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1372,11 +1372,23 @@ enum {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0076-mtk-wifi-mt76-mt7996-add-support-for-WMM-PBC-configu.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0075-mtk-wifi-mt76-mt7996-add-support-for-WMM-PBC-configu.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0076-mtk-wifi-mt76-mt7996-add-support-for-WMM-PBC-configu.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0075-mtk-wifi-mt76-mt7996-add-support-for-WMM-PBC-configu.patch
index c3b13e6..8431795 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0076-mtk-wifi-mt76-mt7996-add-support-for-WMM-PBC-configu.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0075-mtk-wifi-mt76-mt7996-add-support-for-WMM-PBC-configu.patch
@@ -1,7 +1,7 @@
-From b524ec9e1239ff6edd8ffadf8ce9fe03c2621f64 Mon Sep 17 00:00:00 2001
+From 18c78d7766c1eeca5481745112a07bfa3801ccd9 Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Thu, 4 Jan 2024 09:47:00 +0800
-Subject: [PATCH 076/116] mtk: wifi: mt76: mt7996: add support for WMM PBC
+Subject: [PATCH 075/115] mtk: wifi: mt76: mt7996: add support for WMM PBC
  configuration
 
 Query per-AC-queue packet statistics from WA, and determine if multi-AC transmission is ongoing.
@@ -18,7 +18,7 @@
  6 files changed, 105 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index f389470..92f0bd7 100644
+index bb94035..9075f52 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1027,6 +1027,7 @@ enum {
@@ -38,7 +38,7 @@
  	MCU_EXT_CMD_SET_RADAR_TH = 0x7c,
  	MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index e29cebe..f411146 100644
+index 178f247..dea9f8c 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
 @@ -1536,6 +1536,8 @@ int mt7996_register_device(struct mt7996_dev *dev)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0077-mtk-wifi-mt76-mt7996-eagle-support-extra-option_type.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0076-mtk-wifi-mt76-mt7996-eagle-support-extra-option_type.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0077-mtk-wifi-mt76-mt7996-eagle-support-extra-option_type.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0076-mtk-wifi-mt76-mt7996-eagle-support-extra-option_type.patch
index 658e5f7..cd2c842 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0077-mtk-wifi-mt76-mt7996-eagle-support-extra-option_type.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0076-mtk-wifi-mt76-mt7996-eagle-support-extra-option_type.patch
@@ -1,7 +1,7 @@
-From 0749ce8ea6a89c47f1e5b1a85ad5dfcd8fc4dc02 Mon Sep 17 00:00:00 2001
+From 60b3839750a4fb7c940074694f7abcecd49f9e19 Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Thu, 1 Feb 2024 10:32:42 +0800
-Subject: [PATCH 077/116] mtk: wifi: mt76: mt7996: eagle support extra
+Subject: [PATCH 076/115] mtk: wifi: mt76: mt7996: eagle support extra
  option_type
 
 1. eagle + mt7988d option_type 2 support
@@ -111,10 +111,10 @@
  		mt76_wr(dev, MT_WFDMA0_PAUSE_RX_Q_45_TH + hif1_ofs, 0xc000c);
  		mt76_wr(dev, MT_WFDMA0_PAUSE_RX_Q_67_TH + hif1_ofs, 0x10008);
 diff --git a/mt7996/init.c b/mt7996/init.c
-index f411146..1e7cd52 100644
+index dea9f8c..fe79084 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -511,7 +511,7 @@ static void mt7996_mac_init_basic_rates(struct mt7996_dev *dev)
+@@ -512,7 +512,7 @@ static void mt7996_mac_init_basic_rates(struct mt7996_dev *dev)
  void mt7996_mac_init(struct mt7996_dev *dev)
  {
  #define HIF_TXD_V2_1	0x21
@@ -123,7 +123,7 @@
  
  	mt76_clear(dev, MT_MDP_DCR2, MT_MDP_DCR2_RX_TRANS_SHORT);
  
-@@ -525,22 +525,45 @@ void mt7996_mac_init(struct mt7996_dev *dev)
+@@ -526,22 +526,45 @@ void mt7996_mac_init(struct mt7996_dev *dev)
  	}
  
  	/* rro module init */
@@ -179,7 +179,7 @@
  	}
  
  	mt7996_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET),
-@@ -618,9 +641,22 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -619,9 +642,22 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  	if (phy)
  		return 0;
  
@@ -205,7 +205,7 @@
  	}
  
  	mphy = mt76_alloc_phy(&dev->mt76, sizeof(*phy), &mt7996_ops, band);
-@@ -1059,6 +1095,9 @@ int mt7996_get_chip_sku(struct mt7996_dev *dev)
+@@ -1060,6 +1096,9 @@ int mt7996_get_chip_sku(struct mt7996_dev *dev)
  static int mt7996_init_hardware(struct mt7996_dev *dev)
  {
  	int ret, idx;
@@ -216,7 +216,7 @@
  	mt76_wr(dev, MT_INT_SOURCE_CSR, ~0);
  	if (is_mt7992(&dev->mt76)) {
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 801e480..1894588 100644
+index c90eb4b..41a5fc6 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -1606,8 +1606,19 @@ mt7996_net_fill_forward_path(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0078-mtk-wifi-mt76-mt7996-support-enable-disable-thermal-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0077-mtk-wifi-mt76-mt7996-support-enable-disable-thermal-.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0078-mtk-wifi-mt76-mt7996-support-enable-disable-thermal-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0077-mtk-wifi-mt76-mt7996-support-enable-disable-thermal-.patch
index 90ce5bf..07101f4 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0078-mtk-wifi-mt76-mt7996-support-enable-disable-thermal-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0077-mtk-wifi-mt76-mt7996-support-enable-disable-thermal-.patch
@@ -1,7 +1,7 @@
-From 4ced99d2b25f8804f194317675f3a7cce0f493b2 Mon Sep 17 00:00:00 2001
+From 4a5372fadb6e21878ec1812d79ed1f586050328e Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Thu, 27 Jul 2023 19:35:32 +0800
-Subject: [PATCH 078/116] mtk: wifi: mt76: mt7996: support enable/disable
+Subject: [PATCH 077/115] mtk: wifi: mt76: mt7996: support enable/disable
  thermal protection mechanism
 
 This commit adds a new debugfs thermal_enable to enable/disable thermal
@@ -24,7 +24,7 @@
  3 files changed, 47 insertions(+)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 1894588..775d81e 100644
+index 41a5fc6..def0bc3 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -91,6 +91,7 @@ int mt7996_run(struct ieee80211_hw *hw)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0079-mtk-wifi-mt76-mt7996-support-thermal-recal-debug-com.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0078-mtk-wifi-mt76-mt7996-support-thermal-recal-debug-com.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0079-mtk-wifi-mt76-mt7996-support-thermal-recal-debug-com.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0078-mtk-wifi-mt76-mt7996-support-thermal-recal-debug-com.patch
index bf9ce92..03e871d 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0079-mtk-wifi-mt76-mt7996-support-thermal-recal-debug-com.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0078-mtk-wifi-mt76-mt7996-support-thermal-recal-debug-com.patch
@@ -1,7 +1,7 @@
-From 5a95bf563b00a4d60292580619c8bc041697b548 Mon Sep 17 00:00:00 2001
+From 4415bff01088c88b414f18d25fbc1a81dbd2f907 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Thu, 4 Jan 2024 19:53:37 +0800
-Subject: [PATCH 079/116] mtk: wifi: mt76: mt7996: support thermal recal debug
+Subject: [PATCH 078/115] mtk: wifi: mt76: mt7996: support thermal recal debug
  command
 
 Add support thermal recal debug command.
@@ -23,7 +23,7 @@
  4 files changed, 40 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 92f0bd7..c19f8e0 100644
+index 9075f52..67159f3 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1287,6 +1287,7 @@ enum {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0080-mtk-wifi-mt76-mt7996-add-kite-two-pcie-with-two-wed-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0079-mtk-wifi-mt76-mt7996-add-kite-two-pcie-with-two-wed-.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0080-mtk-wifi-mt76-mt7996-add-kite-two-pcie-with-two-wed-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0079-mtk-wifi-mt76-mt7996-add-kite-two-pcie-with-two-wed-.patch
index 7cf05e6..54710bd 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0080-mtk-wifi-mt76-mt7996-add-kite-two-pcie-with-two-wed-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0079-mtk-wifi-mt76-mt7996-add-kite-two-pcie-with-two-wed-.patch
@@ -1,7 +1,7 @@
-From f56bd70e5c9b889582244a4f22a510de9b19bc74 Mon Sep 17 00:00:00 2001
+From caaae483bc61920b48ff40a7e00ded402b8c487f Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Tue, 19 Mar 2024 13:16:12 +0800
-Subject: [PATCH 080/116] mtk: wifi: mt76: mt7996: add kite two pcie with two
+Subject: [PATCH 079/115] mtk: wifi: mt76: mt7996: add kite two pcie with two
  wed support
 
 Signed-off-by: Rex Lu <rex.lu@mediatek.com>
@@ -131,10 +131,10 @@
  				       MT_RXQ_ID(MT_RXQ_BAND1_WA),
  				       MT7996_RX_MCU_RING_SIZE,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 1e7cd52..768979e 100644
+index fe79084..60ea5eb 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -525,39 +525,46 @@ void mt7996_mac_init(struct mt7996_dev *dev)
+@@ -526,39 +526,46 @@ void mt7996_mac_init(struct mt7996_dev *dev)
  	}
  
  	/* rro module init */
@@ -202,7 +202,7 @@
  
  	if (dev->has_rro) {
  		u16 timeout;
-@@ -641,7 +648,7 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -642,7 +649,7 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  	if (phy)
  		return 0;
  
@@ -211,7 +211,7 @@
  		switch (dev->option_type) {
  		case 2:
  			/* eagle + 7988d */
-@@ -651,7 +658,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -652,7 +659,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  			}
  			break;
  		default:
@@ -222,7 +222,7 @@
  				wed = &dev->mt76.mmio.wed_hif2;
  			}
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 775d81e..c9e8108 100644
+index def0bc3..04d0c5e 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -1607,7 +1607,7 @@ mt7996_net_fill_forward_path(struct ieee80211_hw *hw,
@@ -245,7 +245,7 @@
  			break;
  		}
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index 91567a0..6028182 100644
+index 4baae0e..d4739fe 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -336,10 +336,16 @@ int mt7996_mmio_wed_init(struct mt7996_dev *dev, void *pdev_ptr,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0081-mtk-wifi-mt76-mt7992-add-support-to-enable-index-FW-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0080-mtk-wifi-mt76-mt7992-add-support-to-enable-index-FW-.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0081-mtk-wifi-mt76-mt7992-add-support-to-enable-index-FW-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0080-mtk-wifi-mt76-mt7992-add-support-to-enable-index-FW-.patch
index 0748f93..1bd088a 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0081-mtk-wifi-mt76-mt7992-add-support-to-enable-index-FW-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0080-mtk-wifi-mt76-mt7992-add-support-to-enable-index-FW-.patch
@@ -1,7 +1,7 @@
-From 4b13a975d69ad2c954791dbdfbcb3c7c7a5bf63f Mon Sep 17 00:00:00 2001
+From 8973c46518dedc8cec3434b839e40d71231007a9 Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Thu, 11 Jan 2024 08:55:13 +0800
-Subject: [PATCH 081/116] mtk: wifi: mt76: mt7992: add support to enable index
+Subject: [PATCH 080/115] mtk: wifi: mt76: mt7992: add support to enable index
  FW log for ConsysPlanet
 
 Add support to enable and record index FW log, which is the input for ConsysPlanet, via mt76-test command.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0082-wifi-mt76-mt7996-implement-and-switch-to-hw-scan-cal.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0081-wifi-mt76-mt7996-implement-and-switch-to-hw-scan-cal.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0082-wifi-mt76-mt7996-implement-and-switch-to-hw-scan-cal.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0081-wifi-mt76-mt7996-implement-and-switch-to-hw-scan-cal.patch
index c76593a..9949c99 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0082-wifi-mt76-mt7996-implement-and-switch-to-hw-scan-cal.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0081-wifi-mt76-mt7996-implement-and-switch-to-hw-scan-cal.patch
@@ -1,7 +1,7 @@
-From 8a1c29f6a9b99d2f3d699fe6100704349406fc4b Mon Sep 17 00:00:00 2001
+From 33d115d3da15b2cd7f9a37a4b19b24612ce28af4 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Fri, 3 Nov 2023 21:44:45 +0800
-Subject: [PATCH 082/116] wifi: mt76: mt7996: implement and switch to hw scan
+Subject: [PATCH 081/115] wifi: mt76: mt7996: implement and switch to hw scan
  callbacks
 
 To support MLO, hw_scan callbacks are mandatory. However, the
@@ -29,7 +29,7 @@
  7 files changed, 248 insertions(+), 12 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 3c2c2af..0ad3f25 100644
+index 90d8b04..bf12708 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -821,7 +821,7 @@ bool mt76_has_tx_pending(struct mt76_phy *phy)
@@ -50,7 +50,7 @@
  void mt76_update_survey_active_time(struct mt76_phy *phy, ktime_t time)
  {
 diff --git a/mt76.h b/mt76.h
-index 28defd4..8ca7907 100644
+index 1127f9c..c07467e 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -1477,6 +1477,8 @@ void mt76_release_buffered_frames(struct ieee80211_hw *hw,
@@ -63,10 +63,10 @@
  void mt76_update_survey(struct mt76_phy *phy);
  void mt76_update_survey_active_time(struct mt76_phy *phy, ktime_t time);
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 768979e..9523568 100644
+index 60ea5eb..63467e1 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -457,6 +457,9 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -458,6 +458,9 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  
  	wiphy->available_antennas_rx = phy->mt76->antenna_mask;
  	wiphy->available_antennas_tx = phy->mt76->antenna_mask;
@@ -76,7 +76,7 @@
  }
  
  static void
-@@ -677,6 +680,7 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -678,6 +681,7 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  	mphy->dev->phys[band] = mphy;
  
  	INIT_DELAYED_WORK(&mphy->mac_work, mt7996_mac_work);
@@ -242,7 +242,7 @@
 +	ieee80211_queue_delayed_work(hw, &phy->scan_work, duration);
 +}
 diff --git a/mt7996/main.c b/mt7996/main.c
-index c9e8108..5c1735e 100644
+index 04d0c5e..ce262dc 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -312,6 +312,8 @@ static void mt7996_remove_interface(struct ieee80211_hw *hw,
@@ -383,9 +383,9 @@
 +}
 +
  const struct ieee80211_ops mt7996_ops = {
- 	.tx = mt7996_tx,
- 	.start = mt7996_start,
-@@ -1666,8 +1743,8 @@ const struct ieee80211_ops mt7996_ops = {
+ 	.add_chanctx = ieee80211_emulate_add_chanctx,
+ 	.remove_chanctx = ieee80211_emulate_remove_chanctx,
+@@ -1670,8 +1747,8 @@ const struct ieee80211_ops mt7996_ops = {
  	.ampdu_action = mt7996_ampdu_action,
  	.set_rts_threshold = mt7996_set_rts_threshold,
  	.wake_tx_queue = mt76_wake_tx_queue,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0083-wifi-mt76-mt7996-implement-and-switch-to-chanctx-cal.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0082-wifi-mt76-mt7996-implement-and-switch-to-chanctx-cal.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0083-wifi-mt76-mt7996-implement-and-switch-to-chanctx-cal.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0082-wifi-mt76-mt7996-implement-and-switch-to-chanctx-cal.patch
index 0e99f39..9437de3 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0083-wifi-mt76-mt7996-implement-and-switch-to-chanctx-cal.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0082-wifi-mt76-mt7996-implement-and-switch-to-chanctx-cal.patch
@@ -1,7 +1,7 @@
-From d225140776409dcf5b526034682768803e551dbb Mon Sep 17 00:00:00 2001
+From 8616229d1ee0abbac2ccdb361c556ee96473095f Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 6 Nov 2023 16:17:11 +0800
-Subject: [PATCH 083/116] wifi: mt76: mt7996: implement and switch to chanctx
+Subject: [PATCH 082/115] wifi: mt76: mt7996: implement and switch to chanctx
  callbacks
 
 To support MLO, chanctx callbacks are mandatory, since one VIF (MLD) could
@@ -20,10 +20,10 @@
  5 files changed, 211 insertions(+), 18 deletions(-)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 9523568..6eeec3b 100644
+index 63467e1..152390e 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -382,6 +382,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -383,6 +383,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  
  	hw->sta_data_size = sizeof(struct mt7996_sta);
  	hw->vif_data_size = sizeof(struct mt7996_vif);
@@ -31,7 +31,7 @@
  
  	wiphy->iface_combinations = if_comb;
  	wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
-@@ -417,6 +418,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -418,6 +419,7 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);
  	ieee80211_hw_set(hw, WANT_MONITOR_VIF);
  	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
@@ -39,7 +39,7 @@
  
  	hw->max_tx_fragments = 4;
  
-@@ -637,6 +639,22 @@ static int mt7996_vow_init(struct mt7996_phy *phy)
+@@ -638,6 +640,22 @@ static int mt7996_vow_init(struct mt7996_phy *phy)
  	return mt7996_mcu_set_vow_feature_ctrl(phy);
  }
  
@@ -62,7 +62,7 @@
  static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  			       enum mt76_band_id band)
  {
-@@ -720,6 +738,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -721,6 +739,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  	if (ret)
  		goto error;
  
@@ -109,7 +109,7 @@
  		ieee80211_queue_delayed_work(hw, &phy->scan_work, HZ / 10);
  
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 5c1735e..dff0f1f 100644
+index ce262dc..72c8793 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -76,6 +76,11 @@ int mt7996_run(struct ieee80211_hw *hw)
@@ -303,9 +303,9 @@
 +}
 +
  const struct ieee80211_ops mt7996_ops = {
- 	.tx = mt7996_tx,
- 	.start = mt7996_start,
-@@ -1775,4 +1917,10 @@ const struct ieee80211_ops mt7996_ops = {
+ 	.add_chanctx = ieee80211_emulate_add_chanctx,
+ 	.remove_chanctx = ieee80211_emulate_remove_chanctx,
+@@ -1779,4 +1921,10 @@ const struct ieee80211_ops mt7996_ops = {
  	.net_fill_forward_path = mt7996_net_fill_forward_path,
  	.net_setup_tc = mt76_wed_net_setup_tc,
  #endif
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0084-wifi-mt76-mt7996-use-.sta_state-to-replace-.sta_add-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0083-wifi-mt76-mt7996-use-.sta_state-to-replace-.sta_add-.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0084-wifi-mt76-mt7996-use-.sta_state-to-replace-.sta_add-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0083-wifi-mt76-mt7996-use-.sta_state-to-replace-.sta_add-.patch
index cc84e17..5169421 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0084-wifi-mt76-mt7996-use-.sta_state-to-replace-.sta_add-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0083-wifi-mt76-mt7996-use-.sta_state-to-replace-.sta_add-.patch
@@ -1,7 +1,7 @@
-From 21ea1ffbe885bbaba0266f0b835cf58574cecc5f Mon Sep 17 00:00:00 2001
+From 2f905b6593298a91abc967d13abf1089697675a4 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Wed, 8 Nov 2023 18:52:26 +0800
-Subject: [PATCH 084/116] wifi: mt76: mt7996: use .sta_state to replace
+Subject: [PATCH 083/115] wifi: mt76: mt7996: use .sta_state to replace
  .sta_add and .sta_remove
 
 MAC80211 mostly uses MLD address through TX path, and leaves the header
@@ -21,7 +21,7 @@
  3 files changed, 24 insertions(+), 32 deletions(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index dff0f1f..9eb4c5b 100644
+index 72c8793..449911a 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -784,7 +784,7 @@ int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -106,7 +106,7 @@
  static int
  mt7996_get_stats(struct ieee80211_hw *hw,
  		 struct ieee80211_low_level_stats *stats)
-@@ -1877,8 +1867,7 @@ const struct ieee80211_ops mt7996_ops = {
+@@ -1881,8 +1871,7 @@ const struct ieee80211_ops mt7996_ops = {
  	.conf_tx = mt7996_conf_tx,
  	.configure_filter = mt7996_configure_filter,
  	.bss_info_changed = mt7996_bss_info_changed,
@@ -117,7 +117,7 @@
  	.sta_rc_update = mt7996_sta_rc_update,
  	.set_key = mt7996_set_key,
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index 6028182..6abbcb6 100644
+index d4739fe..b94155c 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -655,6 +655,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0085-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0084-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0085-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0084-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
index f035710..edfec83 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0085-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0084-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
@@ -1,7 +1,7 @@
-From a8c22741f0614f90922e3dcac3a94666e29e4682 Mon Sep 17 00:00:00 2001
+From c9b3f99751c3fb8bb691a13fb29dc6238f1ffddc Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Fri, 24 Nov 2023 11:31:55 +0800
-Subject: [PATCH 085/116] wifi: mt76: mt7996: switch to per-link data structure
+Subject: [PATCH 084/115] wifi: mt76: mt7996: switch to per-link data structure
  of vif
 
 Introduce struct mt7996_bss_conf, data structure for per-link BSS.
@@ -71,10 +71,10 @@
  	char buf[100];
  	int ret;
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 6eeec3b..381e129 100644
+index 152390e..b6ce0a5 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -628,11 +628,11 @@ static int mt7996_vow_init(struct mt7996_phy *phy)
+@@ -629,11 +629,11 @@ static int mt7996_vow_init(struct mt7996_phy *phy)
  	vow->drr_quantum[6] = VOW_DRR_QUANTUM_L6;
  	vow->drr_quantum[7] = VOW_DRR_QUANTUM_L7;
  
@@ -186,7 +186,7 @@
  
  	list_del_init(&flow->list);
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 9eb4c5b..bc4863d 100644
+index 449911a..2c5b78a 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -205,29 +205,30 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0086-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0085-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0086-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0085-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
index 7256cb2..fe67a97 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0086-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0085-wifi-mt76-mt7996-switch-to-per-link-data-structure-o.patch
@@ -1,7 +1,7 @@
-From 88111ec93e8bfd47f020965dd075849bd2233e40 Mon Sep 17 00:00:00 2001
+From f04fa7b6443694b82cbff26343aeeb40f685eb42 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 27 Nov 2023 10:43:34 +0800
-Subject: [PATCH 086/116] wifi: mt76: mt7996: switch to per-link data structure
+Subject: [PATCH 085/115] wifi: mt76: mt7996: switch to per-link data structure
  of sta
 
 Introduce struct mt7996_link_sta, data structure for per-link STA.
@@ -41,7 +41,7 @@
  		mt76_connac_mcu_sta_tlv(phy->mt76, sskb, sta, vif, 0,
  					MT76_STA_INFO_STATE_ASSOC);
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 0c7b693..d83d314 100644
+index 40cae9f..05e0a4e 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -371,9 +371,10 @@ EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_omac_tlv);
@@ -100,7 +100,7 @@
  		struct ieee80211_supported_band *sband;
  
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index c19f8e0..740b9f5 100644
+index 67159f3..0668e3d 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1910,8 +1910,8 @@ int mt76_connac_mcu_set_channel_domain(struct mt76_phy *phy);
@@ -125,7 +125,7 @@
  				enum nl80211_band band);
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 363ea0e..cb2e3b2 100644
+index bf3080b..b47fda3 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -1504,7 +1504,7 @@ mt7915_mcu_sta_rate_ctrl_tlv(struct sk_buff *skb, struct mt7915_dev *dev,
@@ -590,7 +590,7 @@
  
  	rcu_read_unlock();
 diff --git a/mt7996/main.c b/mt7996/main.c
-index bc4863d..4e5ba58 100644
+index 2c5b78a..7c8a830 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -229,6 +229,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0087-wifi-mt76-extend-wcid-and-sta-flow-for-MLO-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0086-wifi-mt76-extend-wcid-and-sta-flow-for-MLO-support.patch
similarity index 92%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0087-wifi-mt76-extend-wcid-and-sta-flow-for-MLO-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0086-wifi-mt76-extend-wcid-and-sta-flow-for-MLO-support.patch
index c1cf6ec..3583afd 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0087-wifi-mt76-extend-wcid-and-sta-flow-for-MLO-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0086-wifi-mt76-extend-wcid-and-sta-flow-for-MLO-support.patch
@@ -1,7 +1,7 @@
-From e0f1ba7574dc2a68c51a3a1d9f926dbebfbefc55 Mon Sep 17 00:00:00 2001
+From eed48a443377aeeaa955afa0e7ae744011d8916b Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Wed, 29 Nov 2023 11:04:50 +0800
-Subject: [PATCH 087/116] wifi: mt76: extend wcid and sta flow for MLO support
+Subject: [PATCH 086/115] wifi: mt76: extend wcid and sta flow for MLO support
 
 Add link related info to wcid, and split sta connection flow of common
 parts for MLO supported chipsets.
@@ -16,7 +16,7 @@
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 0ad3f25..4e96b39 100644
+index bf12708..40d4673 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -1067,6 +1067,10 @@ mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb,
@@ -58,7 +58,7 @@
  
  	mt76_wcid_mask_clear(dev->wcid_mask, idx);
 diff --git a/mt76.h b/mt76.h
-index 8ca7907..c3ab96a 100644
+index c07467e..0468cc1 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -381,6 +381,9 @@ struct mt76_wcid {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0088-wifi-mt76-mt7996-enable-MLO-capability.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0087-wifi-mt76-mt7996-enable-MLO-capability.patch
similarity index 89%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0088-wifi-mt76-mt7996-enable-MLO-capability.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0087-wifi-mt76-mt7996-enable-MLO-capability.patch
index 9fbb44a..f23acbb 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0088-wifi-mt76-mt7996-enable-MLO-capability.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0087-wifi-mt76-mt7996-enable-MLO-capability.patch
@@ -1,7 +1,7 @@
-From ebe94f1d3aa73deefe0057ae93974a06b55db1ce Mon Sep 17 00:00:00 2001
+From c4b6c3dd178a0a9f4a97e33f4c4e49d345a72b08 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 30 Nov 2023 16:31:17 +0800
-Subject: [PATCH 088/116] wifi: mt76: mt7996: enable MLO capability
+Subject: [PATCH 087/115] wifi: mt76: mt7996: enable MLO capability
 
 This is a preliminary patch to add MLO support for mt7996 chipsets.
 
@@ -29,10 +29,10 @@
  }
  
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 381e129..c6eb6a5 100644
+index b6ce0a5..2caaf71 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -34,16 +34,45 @@ static const struct ieee80211_iface_combination if_comb[] = {
+@@ -35,16 +35,45 @@ static const struct ieee80211_iface_combination if_comb[] = {
  		.limits = if_limits,
  		.n_limits = ARRAY_SIZE(if_limits),
  		.max_interfaces = MT7996_MAX_INTERFACES,
@@ -79,7 +79,7 @@
  static ssize_t mt7996_thermal_temp_show(struct device *dev,
  					struct device_attribute *attr,
  					char *buf)
-@@ -417,8 +446,9 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -418,8 +447,9 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  	ieee80211_hw_set(hw, SUPPORTS_TX_ENCAP_OFFLOAD);
  	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);
  	ieee80211_hw_set(hw, WANT_MONITOR_VIF);
@@ -90,7 +90,7 @@
  
  	hw->max_tx_fragments = 4;
  
-@@ -462,6 +492,12 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
+@@ -463,6 +493,12 @@ mt7996_init_wiphy(struct ieee80211_hw *hw, struct mtk_wed_device *wed)
  
  	wiphy->max_scan_ssids = 4;
  	wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0089-wifi-mt76-mt7996-support-multi-link-vif-links-and-ML.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0088-wifi-mt76-mt7996-support-multi-link-vif-links-and-ML.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0089-wifi-mt76-mt7996-support-multi-link-vif-links-and-ML.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0088-wifi-mt76-mt7996-support-multi-link-vif-links-and-ML.patch
index c4d110d..59d1d28 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0089-wifi-mt76-mt7996-support-multi-link-vif-links-and-ML.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0088-wifi-mt76-mt7996-support-multi-link-vif-links-and-ML.patch
@@ -1,7 +1,7 @@
-From 9b5284be6784cf32222425a9cbbd9622db38aafd Mon Sep 17 00:00:00 2001
+From f7a43c99a84048a424401ec0650da76fa27b24af Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 23 Nov 2023 18:22:11 +0800
-Subject: [PATCH 089/116] wifi: mt76: mt7996: support multi-link vif links and
+Subject: [PATCH 088/115] wifi: mt76: mt7996: support multi-link vif links and
  MLO bss callbacks
 
 Rework add/remove interface functions to add/remove bss_conf functions,
@@ -18,7 +18,7 @@
  3 files changed, 270 insertions(+), 66 deletions(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 4e5ba58..9fbb86c 100644
+index 7c8a830..2aaa26f 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -205,6 +205,38 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask)
@@ -473,9 +473,9 @@
 +}
 +
  const struct ieee80211_ops mt7996_ops = {
- 	.tx = mt7996_tx,
- 	.start = mt7996_start,
-@@ -1982,7 +2170,8 @@ const struct ieee80211_ops mt7996_ops = {
+ 	.add_chanctx = ieee80211_emulate_add_chanctx,
+ 	.remove_chanctx = ieee80211_emulate_remove_chanctx,
+@@ -1986,7 +2174,8 @@ const struct ieee80211_ops mt7996_ops = {
  	.config = mt7996_config,
  	.conf_tx = mt7996_conf_tx,
  	.configure_filter = mt7996_configure_filter,
@@ -485,7 +485,7 @@
  	.sta_state = mt76_sta_state,
  	.sta_pre_rcu_remove = mt76_sta_pre_rcu_remove,
  	.sta_rc_update = mt7996_sta_rc_update,
-@@ -2028,4 +2217,5 @@ const struct ieee80211_ops mt7996_ops = {
+@@ -2032,4 +2221,5 @@ const struct ieee80211_ops mt7996_ops = {
  	.assign_vif_chanctx = mt7996_assign_vif_chanctx,
  	.unassign_vif_chanctx = mt7996_unassign_vif_chanctx,
  	.switch_vif_chanctx = mt7996_switch_vif_chanctx,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0090-wifi-mt76-mt7996-support-multi-link-sta-links-and-ML.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0089-wifi-mt76-mt7996-support-multi-link-sta-links-and-ML.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0090-wifi-mt76-mt7996-support-multi-link-sta-links-and-ML.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0089-wifi-mt76-mt7996-support-multi-link-sta-links-and-ML.patch
index b4ea4c0..76b3e98 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0090-wifi-mt76-mt7996-support-multi-link-sta-links-and-ML.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0089-wifi-mt76-mt7996-support-multi-link-sta-links-and-ML.patch
@@ -1,7 +1,7 @@
-From 707513db7b37788147180eda7215eb23561d579f Mon Sep 17 00:00:00 2001
+From a0d0d2139381b286353d65db61b40d533ea2fa26 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Wed, 29 Nov 2023 10:12:39 +0800
-Subject: [PATCH 090/116] wifi: mt76: mt7996: support multi-link sta links and
+Subject: [PATCH 089/115] wifi: mt76: mt7996: support multi-link sta links and
  MLO sta callbacks
 
 Rework add_sta functions to add_link_sta functions, and support
@@ -20,7 +20,7 @@
  5 files changed, 398 insertions(+), 66 deletions(-)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 740b9f5..728ffb3 100644
+index 0668e3d..ba99608 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -814,7 +814,9 @@ enum {
@@ -34,7 +34,7 @@
  	STA_REC_KEY_V3 = 0x27,
  	STA_REC_HDRT = 0x28,
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 9fbb86c..37e065f 100644
+index 2aaa26f..89fc91b 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -928,42 +928,234 @@ mt7996_channel_switch_beacon(struct ieee80211_hw *hw,
@@ -391,9 +391,9 @@
 +}
 +
  const struct ieee80211_ops mt7996_ops = {
- 	.tx = mt7996_tx,
- 	.start = mt7996_start,
-@@ -2218,4 +2394,5 @@ const struct ieee80211_ops mt7996_ops = {
+ 	.add_chanctx = ieee80211_emulate_add_chanctx,
+ 	.remove_chanctx = ieee80211_emulate_remove_chanctx,
+@@ -2222,4 +2398,5 @@ const struct ieee80211_ops mt7996_ops = {
  	.unassign_vif_chanctx = mt7996_unassign_vif_chanctx,
  	.switch_vif_chanctx = mt7996_switch_vif_chanctx,
  	.change_vif_links = mt7996_change_vif_links,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0091-wifi-mt76-mt7996-introduce-mt7996_band_phy-for-ch-ba.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0090-wifi-mt76-mt7996-introduce-mt7996_band_phy-for-ch-ba.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0091-wifi-mt76-mt7996-introduce-mt7996_band_phy-for-ch-ba.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0090-wifi-mt76-mt7996-introduce-mt7996_band_phy-for-ch-ba.patch
index 45d16d3..7779478 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0091-wifi-mt76-mt7996-introduce-mt7996_band_phy-for-ch-ba.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0090-wifi-mt76-mt7996-introduce-mt7996_band_phy-for-ch-ba.patch
@@ -1,7 +1,7 @@
-From 5aa4150e28fdef37bedc7231913a17c260b7aef0 Mon Sep 17 00:00:00 2001
+From 765faec674549e005e621f2fafd3e6d95f6958a2 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Fri, 1 Dec 2023 16:01:53 +0800
-Subject: [PATCH 091/116] wifi: mt76: mt7996: introduce mt7996_band_phy() for
+Subject: [PATCH 090/115] wifi: mt76: mt7996: introduce mt7996_band_phy() for
  ch band and phy mapping
 
 For MLO devices, one ieee80211_hw can be mapped to several bands, and
@@ -16,7 +16,7 @@
  2 files changed, 112 insertions(+), 59 deletions(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 37e065f..e443761 100644
+index 89fc91b..bc5c371 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -41,9 +41,8 @@ static void mt7996_testmode_disable_all(struct mt7996_dev *dev)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0092-wifi-mt76-mt7996-rework-ieee80211_ops-callbacks-for-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0091-wifi-mt76-mt7996-rework-ieee80211_ops-callbacks-for-.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0092-wifi-mt76-mt7996-rework-ieee80211_ops-callbacks-for-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0091-wifi-mt76-mt7996-rework-ieee80211_ops-callbacks-for-.patch
index 13bff79..ee60c12 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0092-wifi-mt76-mt7996-rework-ieee80211_ops-callbacks-for-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0091-wifi-mt76-mt7996-rework-ieee80211_ops-callbacks-for-.patch
@@ -1,7 +1,7 @@
-From 31581304bf759bc9d85325c233731aaa5667d311 Mon Sep 17 00:00:00 2001
+From be68b0fc185ab552e6617f507ff85c33db19d728 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Fri, 1 Dec 2023 17:26:43 +0800
-Subject: [PATCH 092/116] wifi: mt76: mt7996: rework ieee80211_ops callbacks
+Subject: [PATCH 091/115] wifi: mt76: mt7996: rework ieee80211_ops callbacks
  for link consideration
 
 Extend ieee80211 callback functions to support multi-link operation.
@@ -15,7 +15,7 @@
  1 file changed, 204 insertions(+), 109 deletions(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index e443761..f5658d4 100644
+index bc5c371..4263be5 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -568,7 +568,6 @@ static int mt7996_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
@@ -487,7 +487,7 @@
  	if (mlink->wcid.idx > MT7996_WTBL_STA)
  		return -EIO;
  
-@@ -2380,7 +2475,7 @@ const struct ieee80211_ops mt7996_ops = {
+@@ -2384,7 +2479,7 @@ const struct ieee80211_ops mt7996_ops = {
  	.vif_cfg_changed = mt7996_vif_cfg_changed,
  	.link_info_changed = mt7996_link_info_changed,
  	.sta_state = mt76_sta_state,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0093-wifi-mt76-mt7996-rework-TXD-for-multi-link-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0092-wifi-mt76-mt7996-rework-TXD-for-multi-link-support.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0093-wifi-mt76-mt7996-rework-TXD-for-multi-link-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0092-wifi-mt76-mt7996-rework-TXD-for-multi-link-support.patch
index 6509b04..5e8de3c 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0093-wifi-mt76-mt7996-rework-TXD-for-multi-link-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0092-wifi-mt76-mt7996-rework-TXD-for-multi-link-support.patch
@@ -1,7 +1,7 @@
-From 59f38b9ffa5320f9d80c0752d8ffc15dcf0114c5 Mon Sep 17 00:00:00 2001
+From 3939dd59b336ba4af861646068d175ab638dfea8 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 4 Dec 2023 11:25:54 +0800
-Subject: [PATCH 093/116] wifi: mt76: mt7996: rework TXD for multi-link support
+Subject: [PATCH 092/115] wifi: mt76: mt7996: rework TXD for multi-link support
 
 This is a preliminary patch to add MLO support for mt7996 chipsets.
 
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0094-wifi-mt76-mt7996-rework-TXS-for-multi-link-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0093-wifi-mt76-mt7996-rework-TXS-for-multi-link-support.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0094-wifi-mt76-mt7996-rework-TXS-for-multi-link-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0093-wifi-mt76-mt7996-rework-TXS-for-multi-link-support.patch
index 8e6acb1..e92540d 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0094-wifi-mt76-mt7996-rework-TXS-for-multi-link-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0093-wifi-mt76-mt7996-rework-TXS-for-multi-link-support.patch
@@ -1,7 +1,7 @@
-From 13cf1c4b8027b2747c067d1bdd2f927f8c266b31 Mon Sep 17 00:00:00 2001
+From 641944dd88df279eca48d2587d64f2c78b0b39f1 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 4 Dec 2023 11:57:38 +0800
-Subject: [PATCH 094/116] wifi: mt76: mt7996: rework TXS for multi-link support
+Subject: [PATCH 093/115] wifi: mt76: mt7996: rework TXS for multi-link support
 
 This is a preliminary patch to add MLO support for mt7996 chipsets.
 
@@ -58,7 +58,7 @@
  	if (list_empty(&mlink->wcid.poll_list))
  		list_add_tail(&mlink->wcid.poll_list, &dev->mt76.sta_poll_list);
 diff --git a/mt7996/main.c b/mt7996/main.c
-index f5658d4..a94955c 100644
+index 4263be5..7388632 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -2317,6 +2317,7 @@ mt7996_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0095-wifi-mt76-mt7996-rework-RXD-for-multi-link-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0094-wifi-mt76-mt7996-rework-RXD-for-multi-link-support.patch
similarity index 93%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0095-wifi-mt76-mt7996-rework-RXD-for-multi-link-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0094-wifi-mt76-mt7996-rework-RXD-for-multi-link-support.patch
index 3d24613..1e84213 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0095-wifi-mt76-mt7996-rework-RXD-for-multi-link-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0094-wifi-mt76-mt7996-rework-RXD-for-multi-link-support.patch
@@ -1,7 +1,7 @@
-From eeabbc93450223a64bfbb812c2dd938219e58bc2 Mon Sep 17 00:00:00 2001
+From 4a8fbb190c87a3a110e168f4813d03a16c7ad502 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 4 Dec 2023 14:50:47 +0800
-Subject: [PATCH 095/116] wifi: mt76: mt7996: rework RXD for multi-link support
+Subject: [PATCH 094/115] wifi: mt76: mt7996: rework RXD for multi-link support
 
 This is a preliminary patch to add MLO support for mt7996 chipsets.
 
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0096-wifi-mt76-mt7996-rework-mac-functions-for-multi-link.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0095-wifi-mt76-mt7996-rework-mac-functions-for-multi-link.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0096-wifi-mt76-mt7996-rework-mac-functions-for-multi-link.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0095-wifi-mt76-mt7996-rework-mac-functions-for-multi-link.patch
index fcb59e6..07309d6 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0096-wifi-mt76-mt7996-rework-mac-functions-for-multi-link.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0095-wifi-mt76-mt7996-rework-mac-functions-for-multi-link.patch
@@ -1,7 +1,7 @@
-From 0bd2c0dd6b87178561f38f27cd0be5009b56d43c Mon Sep 17 00:00:00 2001
+From 9a4ebd390278917c1e5c7cf4756db9871a4880b0 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 4 Dec 2023 18:31:02 +0800
-Subject: [PATCH 096/116] wifi: mt76: mt7996: rework mac functions for
+Subject: [PATCH 095/115] wifi: mt76: mt7996: rework mac functions for
  multi-link support
 
 This is a preliminary patch to add MLO support for mt7996 chipsets.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0097-wifi-mt76-connac-rework-mcu-functions-for-multi-link.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0096-wifi-mt76-connac-rework-mcu-functions-for-multi-link.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0097-wifi-mt76-connac-rework-mcu-functions-for-multi-link.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0096-wifi-mt76-connac-rework-mcu-functions-for-multi-link.patch
index c4caeb7..9db1aeb 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0097-wifi-mt76-connac-rework-mcu-functions-for-multi-link.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0096-wifi-mt76-connac-rework-mcu-functions-for-multi-link.patch
@@ -1,7 +1,7 @@
-From c83a1297e94b7b05b1acb8245347ed6443f8b50e Mon Sep 17 00:00:00 2001
+From f3ef3fb746b5e2041a22e42365cb12707e484d71 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 7 Dec 2023 15:39:03 +0800
-Subject: [PATCH 097/116] wifi: mt76: connac: rework mcu functions for
+Subject: [PATCH 096/115] wifi: mt76: connac: rework mcu functions for
  multi-link support
 
 This is a preliminary patch to add MLO support for mt7996 chipsets.
@@ -32,7 +32,7 @@
  		mt76_connac_mcu_sta_tlv(phy->mt76, sskb, sta, vif, 0,
  					MT76_STA_INFO_STATE_ASSOC);
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index d83d314..9ea7471 100644
+index 05e0a4e..955aa0a 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -370,10 +370,11 @@ void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,
@@ -72,7 +72,7 @@
  	if (info->sta && info->enable)
  		mt76_connac_mcu_sta_tlv(phy, skb, info->sta,
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 728ffb3..b93b5e0 100644
+index ba99608..11e9ae7 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1911,7 +1911,7 @@ mt76_connac_mcu_add_tlv(struct sk_buff *skb, int tag, int len)
@@ -85,7 +85,7 @@
  				   bool enable, bool newly);
  void mt76_connac_mcu_wtbl_generic_tlv(struct mt76_dev *dev, struct sk_buff *skb,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index cb2e3b2..d2294e5 100644
+index b47fda3..664d155 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -1669,7 +1669,8 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0098-wifi-mt76-connac-rework-connac-helpers.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0097-wifi-mt76-connac-rework-connac-helpers.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0098-wifi-mt76-connac-rework-connac-helpers.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0097-wifi-mt76-connac-rework-connac-helpers.patch
index 02d240f..b569bbf 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0098-wifi-mt76-connac-rework-connac-helpers.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0097-wifi-mt76-connac-rework-connac-helpers.patch
@@ -1,7 +1,7 @@
-From 056ff64bf4b942ff77e1b5931cdabd236f9d0f83 Mon Sep 17 00:00:00 2001
+From 6a2e4d0ea397807c33b95970d73c6c5ecba9c652 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 11 Dec 2023 18:45:00 +0800
-Subject: [PATCH 098/116] wifi: mt76: connac: rework connac helpers
+Subject: [PATCH 097/115] wifi: mt76: connac: rework connac helpers
 
 Rework connac helpers related to rate and phymode.
 This is a preliminary patch to add MLO support for mt7996 chipsets.
@@ -93,7 +93,7 @@
  		u32 val = MT_TXD6_FIXED_BW;
  
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 9ea7471..71f3d30 100644
+index 955aa0a..57cfa61 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -1361,7 +1361,7 @@ u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,
@@ -118,7 +118,7 @@
  
  	switch (band) {
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index b93b5e0..4d0fd4b 100644
+index 11e9ae7..fd3179a 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -2023,7 +2023,7 @@ mt76_connac_get_eht_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif);
@@ -131,7 +131,7 @@
  
  int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
 diff --git a/mt7925/main.c b/mt7925/main.c
-index 1f07ec5..6d7ec77 100644
+index 6179798..da6a862 100644
 --- a/mt7925/main.c
 +++ b/mt7925/main.c
 @@ -675,7 +675,7 @@ mt7925_get_rates_table(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -144,7 +144,7 @@
  
  	if (beacon && ht) {
 diff --git a/mt7996/main.c b/mt7996/main.c
-index a94955c..0245b6b 100644
+index 7388632..0003047 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -804,7 +804,7 @@ mt7996_get_rates_table(struct ieee80211_hw *hw, struct ieee80211_bss_conf *conf,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0099-wifi-mt76-mt7996-handle-mapping-for-hw-and-phy.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0098-wifi-mt76-mt7996-handle-mapping-for-hw-and-phy.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0099-wifi-mt76-mt7996-handle-mapping-for-hw-and-phy.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0098-wifi-mt76-mt7996-handle-mapping-for-hw-and-phy.patch
index e1391b5..518ce29 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0099-wifi-mt76-mt7996-handle-mapping-for-hw-and-phy.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0098-wifi-mt76-mt7996-handle-mapping-for-hw-and-phy.patch
@@ -1,7 +1,7 @@
-From b359a84d5cb94c2856285a0d82422a6b232f7f70 Mon Sep 17 00:00:00 2001
+From d705237bc79f93b8775af2746fb0b27e1fad5d4f Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Tue, 5 Dec 2023 13:56:51 +0800
-Subject: [PATCH 099/116] wifi: mt76: mt7996: handle mapping for hw and phy
+Subject: [PATCH 098/115] wifi: mt76: mt7996: handle mapping for hw and phy
 
 We've used mt7996_band_phy() to do mapping from ieee80211_hw to mt7996_phy,
 and this patch is a temporal workaround for opposite direction.
@@ -16,7 +16,7 @@
  4 files changed, 55 insertions(+), 14 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 4e96b39..de2c00d 100644
+index 40d4673..cd7f2f9 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -824,9 +824,13 @@ EXPORT_SYMBOL_GPL(mt76_has_tx_pending);
@@ -55,7 +55,7 @@
  	if ((mstat.flag & RX_FLAG_8023) || ieee80211_is_data_qos(hdr->frame_control)) {
  		struct mt76_phy *phy = mt76_dev_phy(dev, mstat.phy_idx);
 diff --git a/mt76.h b/mt76.h
-index c3ab96a..ebfd379 100644
+index 0468cc1..ad46634 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -831,6 +831,7 @@ struct mt76_vif {
@@ -108,7 +108,7 @@
  				      NULL)) {
  		rcu_read_unlock();
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 0245b6b..34ff96d 100644
+index 0003047..30da3c1 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -173,6 +173,7 @@ static void mt7996_stop(struct ieee80211_hw *hw)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0100-wifi-mt76-mt7996-handle-mapping-for-hw-and-vif.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0099-wifi-mt76-mt7996-handle-mapping-for-hw-and-vif.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0100-wifi-mt76-mt7996-handle-mapping-for-hw-and-vif.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0099-wifi-mt76-mt7996-handle-mapping-for-hw-and-vif.patch
index 6fa4af2..22ddfda 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0100-wifi-mt76-mt7996-handle-mapping-for-hw-and-vif.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0099-wifi-mt76-mt7996-handle-mapping-for-hw-and-vif.patch
@@ -1,7 +1,7 @@
-From 556174db2cbb957fdc977ecfcef3b20a3dcd670b Mon Sep 17 00:00:00 2001
+From 53b7760e4d51802d122cc45ab00faa6e158d8bd0 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Fri, 8 Dec 2023 18:08:13 +0800
-Subject: [PATCH 100/116] wifi: mt76: mt7996: handle mapping for hw and vif
+Subject: [PATCH 099/115] wifi: mt76: mt7996: handle mapping for hw and vif
 
 We have several temporal workarounds for ieee80211_hw and mt76_phy
 mappings. For legacy MBSS cases, we also need a method to do the
@@ -37,7 +37,7 @@
  	ieee80211_tx_status_ext(hw, &status);
  	spin_unlock_bh(&dev->rx_lock);
 diff --git a/mac80211.c b/mac80211.c
-index de2c00d..1dec143 100644
+index cd7f2f9..14ec495 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -1520,7 +1520,7 @@ void mt76_wcid_cleanup(struct mt76_dev *dev, struct mt76_wcid *wcid)
@@ -50,7 +50,7 @@
  	}
  }
 diff --git a/mt76.h b/mt76.h
-index ebfd379..1d57e21 100644
+index ad46634..8ed26b0 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -556,6 +556,9 @@ struct mt76_driver_ops {
@@ -133,7 +133,7 @@
 +	}
 +}
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 34ff96d..ddfde58 100644
+index 30da3c1..43285c1 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -444,6 +444,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,
@@ -163,7 +163,7 @@
  
  	if (!skb) {
 diff --git a/mt7996/mmio.c b/mt7996/mmio.c
-index 6abbcb6..6bebdd8 100644
+index b94155c..58db520 100644
 --- a/mt7996/mmio.c
 +++ b/mt7996/mmio.c
 @@ -658,6 +658,7 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0101-wifi-mt76-mt7996-rework-scanning-parts-for-MLD-STA-s.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0100-wifi-mt76-mt7996-rework-scanning-parts-for-MLD-STA-s.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0101-wifi-mt76-mt7996-rework-scanning-parts-for-MLD-STA-s.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0100-wifi-mt76-mt7996-rework-scanning-parts-for-MLD-STA-s.patch
index c79b078..cdec2a3 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0101-wifi-mt76-mt7996-rework-scanning-parts-for-MLD-STA-s.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0100-wifi-mt76-mt7996-rework-scanning-parts-for-MLD-STA-s.patch
@@ -1,7 +1,7 @@
-From 1cad504914e594c629dd2b5a5b67ff58afd307e6 Mon Sep 17 00:00:00 2001
+From f2e0d8b4624fa982bcd0fa5a07eb08d0e17c8d31 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Wed, 13 Dec 2023 16:58:31 +0800
-Subject: [PATCH 101/116] wifi: mt76: mt7996: rework scanning parts for MLD STA
+Subject: [PATCH 100/115] wifi: mt76: mt7996: rework scanning parts for MLD STA
  support
 
 During the first scanning, the STA VIF is still a legacy interface,
@@ -100,7 +100,7 @@
  	phy->scan_req = NULL;
  	phy->scan_vif = NULL;
 diff --git a/mt7996/main.c b/mt7996/main.c
-index ddfde58..ef08563 100644
+index 43285c1..3c44cc3 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -2191,6 +2191,8 @@ mt7996_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0102-wifi-mt76-mt7996-implement-mld-address-translation.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0101-wifi-mt76-mt7996-implement-mld-address-translation.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0102-wifi-mt76-mt7996-implement-mld-address-translation.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0101-wifi-mt76-mt7996-implement-mld-address-translation.patch
index d4e5cae..0527c9b 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0102-wifi-mt76-mt7996-implement-mld-address-translation.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0101-wifi-mt76-mt7996-implement-mld-address-translation.patch
@@ -1,7 +1,7 @@
-From fe38a0bccd1cf3ddb1736d79048b6ae9b17b94d0 Mon Sep 17 00:00:00 2001
+From fe02f1ef56110ea830c0fba9f1a3311b3600f0a1 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 7 Dec 2023 16:31:56 +0800
-Subject: [PATCH 102/116] wifi: mt76: mt7996: implement mld address translation
+Subject: [PATCH 101/115] wifi: mt76: mt7996: implement mld address translation
 
 Do the MLD to link address translation for EAPOL and management frames
 in driver.
@@ -49,7 +49,7 @@
  	for (i = 0; i < nbuf; i++) {
  		u16 len;
 diff --git a/mt7996/main.c b/mt7996/main.c
-index ef08563..61c4d2d 100644
+index 3c44cc3..f7a315b 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -1308,14 +1308,56 @@ static void mt7996_tx(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0103-wifi-mt76-mt7996-use-BSS_CHANGED_TXPOWER-for-txpower.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0102-wifi-mt76-mt7996-use-BSS_CHANGED_TXPOWER-for-txpower.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0103-wifi-mt76-mt7996-use-BSS_CHANGED_TXPOWER-for-txpower.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0102-wifi-mt76-mt7996-use-BSS_CHANGED_TXPOWER-for-txpower.patch
index ab0aacb..3235cbd 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0103-wifi-mt76-mt7996-use-BSS_CHANGED_TXPOWER-for-txpower.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0102-wifi-mt76-mt7996-use-BSS_CHANGED_TXPOWER-for-txpower.patch
@@ -1,7 +1,7 @@
-From dd18695ef0e8a86e7ab7560ef2c07faf2ef381d7 Mon Sep 17 00:00:00 2001
+From be369a7403a12f75ae11527cdbda63cc3fafcec3 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Tue, 27 Feb 2024 18:07:11 +0800
-Subject: [PATCH 103/116] wifi: mt76: mt7996: use BSS_CHANGED_TXPOWER for
+Subject: [PATCH 102/115] wifi: mt76: mt7996: use BSS_CHANGED_TXPOWER for
  txpower setting
 
 This is a preliminary patch to add MLO support for mt7996 chipsets.
@@ -15,7 +15,7 @@
  4 files changed, 9 insertions(+), 13 deletions(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 61c4d2d..2d0dc16 100644
+index f7a315b..ac42ef8 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -661,14 +661,6 @@ static int mt7996_config(struct ieee80211_hw *hw, u32 changed)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0104-wifi-mt76-mt7996-temp-support-for-single-wiphy.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0103-wifi-mt76-mt7996-temp-support-for-single-wiphy.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0104-wifi-mt76-mt7996-temp-support-for-single-wiphy.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0103-wifi-mt76-mt7996-temp-support-for-single-wiphy.patch
index 9f92af3..0c9faa9 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0104-wifi-mt76-mt7996-temp-support-for-single-wiphy.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0103-wifi-mt76-mt7996-temp-support-for-single-wiphy.patch
@@ -1,7 +1,7 @@
-From b8584db9dd73a4686872e75f5919184e4cb109d0 Mon Sep 17 00:00:00 2001
+From 8c9eafa3fede61a86ad74dbcf2f846f93def492f Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 28 Mar 2024 18:50:04 +0800
-Subject: [PATCH 104/116] wifi: mt76: mt7996: temp support for single wiphy
+Subject: [PATCH 103/115] wifi: mt76: mt7996: temp support for single wiphy
 
 Add temporal single wiphy for simultaneously supporting MLD and legacy
 interfaces.
@@ -18,7 +18,7 @@
  7 files changed, 81 insertions(+), 77 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 1dec143..8b9f3fd 100644
+index 14ec495..78252e2 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -824,13 +824,9 @@ EXPORT_SYMBOL_GPL(mt76_has_tx_pending);
@@ -57,7 +57,7 @@
  	if ((mstat.flag & RX_FLAG_8023) || ieee80211_is_data_qos(hdr->frame_control)) {
  		struct mt76_phy *phy = mt76_dev_phy(dev, mstat.phy_idx);
 diff --git a/mt76.h b/mt76.h
-index 1d57e21..0452e5d 100644
+index 8ed26b0..927aaf8 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -833,8 +833,8 @@ struct mt76_vif {
@@ -104,10 +104,10 @@
  }
  
 diff --git a/mt7996/init.c b/mt7996/init.c
-index c6eb6a5..f374119 100644
+index 2caaf71..e9ba6a1 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -18,13 +18,13 @@ static const struct ieee80211_iface_limit if_limits[] = {
+@@ -19,13 +19,13 @@ static const struct ieee80211_iface_limit if_limits[] = {
  		.max = 1,
  		.types = BIT(NL80211_IFTYPE_ADHOC)
  	}, {
@@ -123,7 +123,7 @@
  		.types = BIT(NL80211_IFTYPE_STATION)
  	}
  };
-@@ -33,7 +33,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
+@@ -34,7 +34,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
  	{
  		.limits = if_limits,
  		.n_limits = ARRAY_SIZE(if_limits),
@@ -132,7 +132,7 @@
  		.num_different_channels = 3,
  		.beacon_int_infra_match = true,
  		/*
-@@ -795,6 +795,10 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -796,6 +796,10 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  		mtk_wed_device_start(&dev->mt76.mmio.wed_hif2, MT_INT_TX_RX_DONE_EXT);
  	}
  
@@ -143,7 +143,7 @@
  	return 0;
  
  error:
-@@ -811,6 +815,9 @@ mt7996_unregister_phy(struct mt7996_phy *phy, enum mt76_band_id band)
+@@ -812,6 +816,9 @@ mt7996_unregister_phy(struct mt7996_phy *phy, enum mt76_band_id band)
  	if (!phy)
  		return;
  
@@ -197,7 +197,7 @@
  }
  
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 2d0dc16..b0ac649 100644
+index ac42ef8..6052d12 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -140,6 +140,10 @@ static int mt7996_start(struct ieee80211_hw *hw)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0105-wifi-mt76-mt7996-implement-ieee80211_ops-for-link-de.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0104-wifi-mt76-mt7996-implement-ieee80211_ops-for-link-de.patch
similarity index 95%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0105-wifi-mt76-mt7996-implement-ieee80211_ops-for-link-de.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0104-wifi-mt76-mt7996-implement-ieee80211_ops-for-link-de.patch
index 708a27e..c7b78ae 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0105-wifi-mt76-mt7996-implement-ieee80211_ops-for-link-de.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0104-wifi-mt76-mt7996-implement-ieee80211_ops-for-link-de.patch
@@ -1,7 +1,7 @@
-From 79961bfcb2ebe3368d6d1ddf8b09cbf370c855a8 Mon Sep 17 00:00:00 2001
+From 95c9d11b077e1da7378adb079c1ee40b941c186c Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Fri, 29 Dec 2023 18:37:41 +0800
-Subject: [PATCH 105/116] wifi: mt76: mt7996: implement ieee80211_ops for link
+Subject: [PATCH 104/115] wifi: mt76: mt7996: implement ieee80211_ops for link
  debugfs
 
 Add .link_sta_add_debugfs and .link_add_debugfs.
@@ -107,10 +107,10 @@
  				if (mt7996_mcu_wa_cmd(phy->dev, MCU_WA_PARAM_CMD(QUERY), MCU_WA_PARAM_BSS_ACQ_PKT_CNT,
  				                      BSS_ACQ_PKT_CNT_BSS_BITMAP_ALL | BSS_ACQ_PKT_CNT_READ_CLR, 0))
 diff --git a/mt7996/main.c b/mt7996/main.c
-index b0ac649..3e70d86 100644
+index 6052d12..832be32 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
-@@ -2602,6 +2602,8 @@ const struct ieee80211_ops mt7996_ops = {
+@@ -2606,6 +2606,8 @@ const struct ieee80211_ops mt7996_ops = {
  	CFG80211_TESTMODE_DUMP(mt76_testmode_dump)
  #ifdef CONFIG_MAC80211_DEBUGFS
  	.sta_add_debugfs = mt7996_sta_add_debugfs,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0106-mtk-wifi-mt76-mt7996-support-multi-link-channel-swit.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0105-mtk-wifi-mt76-mt7996-support-multi-link-channel-swit.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0106-mtk-wifi-mt76-mt7996-support-multi-link-channel-swit.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0105-mtk-wifi-mt76-mt7996-support-multi-link-channel-swit.patch
index c57d3c8..3ac633d 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0106-mtk-wifi-mt76-mt7996-support-multi-link-channel-swit.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0105-mtk-wifi-mt76-mt7996-support-multi-link-channel-swit.patch
@@ -1,7 +1,7 @@
-From 4969672ddd07d512af13af7622a8c941ddc21d53 Mon Sep 17 00:00:00 2001
+From 28b09c45d13aa03cfce73e0b741703e1c8ffade9 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 19 Jan 2024 14:04:03 +0800
-Subject: [PATCH 106/116] mtk: wifi: mt76: mt7996: support multi-link channel
+Subject: [PATCH 105/115] mtk: wifi: mt76: mt7996: support multi-link channel
  switch
 
 mtk: wifi: mt76: mt7996: remove the limitation of radar detect width for mlo
@@ -35,7 +35,7 @@
  5 files changed, 22 insertions(+), 9 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 8b9f3fd..c2b82fb 100644
+index 78252e2..1004802 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -1798,7 +1798,7 @@ enum mt76_dfs_state mt76_phy_dfs_state(struct mt76_phy *phy)
@@ -48,7 +48,7 @@
  		    (phy->chandef.chan->flags & IEEE80211_CHAN_RADAR))
  			return MT_DFS_STATE_ACTIVE;
 diff --git a/mt76.h b/mt76.h
-index 0452e5d..d88d552 100644
+index 927aaf8..db71244 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -849,6 +849,7 @@ struct mt76_phy {
@@ -60,10 +60,10 @@
  
  	u32 aggr_stats[32];
 diff --git a/mt7996/init.c b/mt7996/init.c
-index f374119..0dee659 100644
+index e9ba6a1..13a2805 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -36,13 +36,11 @@ static const struct ieee80211_iface_combination if_comb[] = {
+@@ -37,13 +37,11 @@ static const struct ieee80211_iface_combination if_comb[] = {
  		.max_interfaces = MT7996_MAX_INTERFACES * 3,
  		.num_different_channels = 3,
  		.beacon_int_infra_match = true,
@@ -78,7 +78,7 @@
  };
  
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 3e70d86..8e44da7 100644
+index 832be32..c1b3914 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -2133,7 +2133,7 @@ static int
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0107-mtk-mt76-mt7996-hw_scan-ACS-channel-time-too-long-on.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0106-mtk-mt76-mt7996-hw_scan-ACS-channel-time-too-long-on.patch
similarity index 87%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0107-mtk-mt76-mt7996-hw_scan-ACS-channel-time-too-long-on.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0106-mtk-mt76-mt7996-hw_scan-ACS-channel-time-too-long-on.patch
index 54f4647..e343c5f 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0107-mtk-mt76-mt7996-hw_scan-ACS-channel-time-too-long-on.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0106-mtk-mt76-mt7996-hw_scan-ACS-channel-time-too-long-on.patch
@@ -1,7 +1,7 @@
-From 919a124e164b3c1ba5fe4fde2ad48e0ef3961d17 Mon Sep 17 00:00:00 2001
+From fe69e7a6f684892429cee0c3a7f41d03d062dfe1 Mon Sep 17 00:00:00 2001
 From: Michael-CY Lee <michael-cy.lee@mediatek.com>
 Date: Thu, 22 Feb 2024 11:09:10 +0800
-Subject: [PATCH 107/116] mtk: mt76: mt7996: hw_scan: ACS channel time too long
+Subject: [PATCH 106/115] mtk: mt76: mt7996: hw_scan: ACS channel time too long
  on duty channel
 
 This problem happens in SW scan and was already fixed.
@@ -15,7 +15,7 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 8e44da7..233bf2a 100644
+index c1b3914..023b838 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -497,6 +497,7 @@ static void ___mt7996_set_channel(struct mt7996_phy *phy,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0108-wifi-mt76-mt7996-add-beacon-monitoring-in-driver-for.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0107-wifi-mt76-mt7996-add-beacon-monitoring-in-driver-for.patch
similarity index 94%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0108-wifi-mt76-mt7996-add-beacon-monitoring-in-driver-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0107-wifi-mt76-mt7996-add-beacon-monitoring-in-driver-for.patch
index cf2d487..37b088a 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0108-wifi-mt76-mt7996-add-beacon-monitoring-in-driver-for.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0107-wifi-mt76-mt7996-add-beacon-monitoring-in-driver-for.patch
@@ -1,7 +1,7 @@
-From e7f7d5d9d5d110e7550ee2cf6fb1e6bcf6455976 Mon Sep 17 00:00:00 2001
+From dfb1f654daf5075eef3fc56849a7d0f0dd99d553 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Tue, 20 Feb 2024 10:08:01 +0800
-Subject: [PATCH 108/116] wifi: mt76: mt7996: add beacon monitoring in driver
+Subject: [PATCH 107/115] wifi: mt76: mt7996: add beacon monitoring in driver
  for mlo
 
 Add beacon monitoring in driver since mac80211 does not
@@ -90,7 +90,7 @@
  		   struct ieee80211_hw **hw)
  {
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 233bf2a..d1f2c25 100644
+index 023b838..01e6a91 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -450,6 +450,7 @@ static int mt7996_add_interface(struct ieee80211_hw *hw,
@@ -154,9 +154,9 @@
 +}
 +
  const struct ieee80211_ops mt7996_ops = {
- 	.tx = mt7996_tx,
- 	.start = mt7996_start,
-@@ -2617,6 +2666,7 @@ const struct ieee80211_ops mt7996_ops = {
+ 	.add_chanctx = ieee80211_emulate_add_chanctx,
+ 	.remove_chanctx = ieee80211_emulate_remove_chanctx,
+@@ -2621,6 +2670,7 @@ const struct ieee80211_ops mt7996_ops = {
  	.net_fill_forward_path = mt7996_net_fill_forward_path,
  	.net_setup_tc = mt76_wed_net_setup_tc,
  #endif
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0109-mtk-wifi-mt76-mt7996-support-band_idx-option-for-set.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0108-mtk-wifi-mt76-mt7996-support-band_idx-option-for-set.patch
similarity index 97%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0109-mtk-wifi-mt76-mt7996-support-band_idx-option-for-set.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0108-mtk-wifi-mt76-mt7996-support-band_idx-option-for-set.patch
index 18dc66b..d0137fd 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0109-mtk-wifi-mt76-mt7996-support-band_idx-option-for-set.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0108-mtk-wifi-mt76-mt7996-support-band_idx-option-for-set.patch
@@ -1,7 +1,7 @@
-From ef9c473ce6e0e65c915225af9d8400dbebb7ae67 Mon Sep 17 00:00:00 2001
+From 2928641265edd9cf8573e45d31117006cfabcc06 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Mon, 4 Mar 2024 16:21:16 +0800
-Subject: [PATCH 109/116] mtk: wifi: mt76: mt7996: support band_idx option for
+Subject: [PATCH 108/115] mtk: wifi: mt76: mt7996: support band_idx option for
  set_mu/get_mu vendor command
 
 The vendor command set_mu and get_mu should be executed with band_idx.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0110-mtk-wifi-mt76-mt7996-tmp-disable-VOW.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0109-mtk-wifi-mt76-mt7996-tmp-disable-VOW.patch
similarity index 92%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0110-mtk-wifi-mt76-mt7996-tmp-disable-VOW.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0109-mtk-wifi-mt76-mt7996-tmp-disable-VOW.patch
index 7d6fb6f..674975c 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0110-mtk-wifi-mt76-mt7996-tmp-disable-VOW.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0109-mtk-wifi-mt76-mt7996-tmp-disable-VOW.patch
@@ -1,7 +1,7 @@
-From 2611bc7e80596500702dd3eef9d34014d00869b3 Mon Sep 17 00:00:00 2001
+From 833e908b1824256d42454f587ad28b3df4ea79b4 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Wed, 20 Mar 2024 22:56:44 +0800
-Subject: [PATCH 110/116] mtk: wifi: mt76: mt7996: tmp disable VOW
+Subject: [PATCH 109/115] mtk: wifi: mt76: mt7996: tmp disable VOW
 
 FW will return failed when legacy 5G station connects after legacy 2G
 station, need to check.
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0111-mtk-wifi-mt76-mt7996-enable-ampdu-limit-to-avoid-BA-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0110-mtk-wifi-mt76-mt7996-enable-ampdu-limit-to-avoid-BA-.patch
similarity index 96%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0111-mtk-wifi-mt76-mt7996-enable-ampdu-limit-to-avoid-BA-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0110-mtk-wifi-mt76-mt7996-enable-ampdu-limit-to-avoid-BA-.patch
index 4c4f50d..92fe241 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0111-mtk-wifi-mt76-mt7996-enable-ampdu-limit-to-avoid-BA-.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0110-mtk-wifi-mt76-mt7996-enable-ampdu-limit-to-avoid-BA-.patch
@@ -1,7 +1,7 @@
-From 20695a924111dee64fb9fa5d8c4996f2333b4aee Mon Sep 17 00:00:00 2001
+From 0ca3421db5dc816d07543dac90877149f21fe103 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 1 Apr 2024 17:00:21 +0800
-Subject: [PATCH 111/116] mtk: wifi: mt76: mt7996: enable ampdu limit to avoid
+Subject: [PATCH 110/115] mtk: wifi: mt76: mt7996: enable ampdu limit to avoid
  BA bound issue
 
 [Description]
@@ -33,7 +33,7 @@
  3 files changed, 95 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 4d0fd4b..1c8e503 100644
+index fd3179a..1a0e843 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -821,6 +821,7 @@ enum {
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0112-wifi-mt76-mt7996-Fix-get_txpower-wrong-result-in-sin.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0111-wifi-mt76-mt7996-Fix-get_txpower-wrong-result-in-sin.patch
similarity index 88%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0112-wifi-mt76-mt7996-Fix-get_txpower-wrong-result-in-sin.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0111-wifi-mt76-mt7996-Fix-get_txpower-wrong-result-in-sin.patch
index 5471917..b16e89e 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0112-wifi-mt76-mt7996-Fix-get_txpower-wrong-result-in-sin.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0111-wifi-mt76-mt7996-Fix-get_txpower-wrong-result-in-sin.patch
@@ -1,7 +1,7 @@
-From e993c3e5aecb0d86609ebda85608bf84547b7ca7 Mon Sep 17 00:00:00 2001
+From 0ecf1d6960b4feb90bbebe873fd5d47d2793c05a Mon Sep 17 00:00:00 2001
 From: Allen Ye <allen.ye@mediatek.com>
 Date: Mon, 8 Apr 2024 16:56:09 +0800
-Subject: [PATCH 112/116] wifi: mt76: mt7996: Fix get_txpower wrong result in
+Subject: [PATCH 111/115] wifi: mt76: mt7996: Fix get_txpower wrong result in
  single wiphy and legacy mode
 
 Fix get_txpower wrong result in single wiphy and legacy mode.
@@ -13,7 +13,7 @@
  1 file changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/mt7996/main.c b/mt7996/main.c
-index d1f2c25..dcb0b07 100644
+index 01e6a91..702968f 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -975,6 +975,32 @@ out:
@@ -49,7 +49,7 @@
  static void
  mt7996_channel_switch_beacon(struct ieee80211_hw *hw,
  			     struct ieee80211_vif *vif,
-@@ -2635,7 +2661,7 @@ const struct ieee80211_ops mt7996_ops = {
+@@ -2639,7 +2665,7 @@ const struct ieee80211_ops mt7996_ops = {
  	.hw_scan = mt7996_hw_scan,
  	.cancel_hw_scan = mt7996_cancel_hw_scan,
  	.release_buffered_frames = mt76_release_buffered_frames,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0113-mtk-wifi-mt76-mt7996-add-beacon_int_min_gcd-to-suppo.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0112-mtk-wifi-mt76-mt7996-add-beacon_int_min_gcd-to-suppo.patch
similarity index 79%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0113-mtk-wifi-mt76-mt7996-add-beacon_int_min_gcd-to-suppo.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0112-mtk-wifi-mt76-mt7996-add-beacon_int_min_gcd-to-suppo.patch
index 273a130..34816a7 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0113-mtk-wifi-mt76-mt7996-add-beacon_int_min_gcd-to-suppo.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0112-mtk-wifi-mt76-mt7996-add-beacon_int_min_gcd-to-suppo.patch
@@ -1,7 +1,7 @@
-From fde0acbc9ad0c869da1a075c408946ba1e7b91d1 Mon Sep 17 00:00:00 2001
+From 2f1b4d750ff78770b5c85cbd54bf884c80517079 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Fri, 19 Apr 2024 11:01:21 +0800
-Subject: [PATCH 113/116] mtk: wifi: mt76: mt7996: add beacon_int_min_gcd to
+Subject: [PATCH 112/115] mtk: wifi: mt76: mt7996: add beacon_int_min_gcd to
  support different beacon interval
 
 When beacon_int_min_gcd is zero, all beacon intervals for different
@@ -18,10 +18,10 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 0dee659..3af9d02 100644
+index 13a2805..b1aa903 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -41,6 +41,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
+@@ -42,6 +42,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
  				       BIT(NL80211_CHAN_WIDTH_40) |
  				       BIT(NL80211_CHAN_WIDTH_80) |
  				       BIT(NL80211_CHAN_WIDTH_160),
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0114-mtk-wifi-mt76-mt7996-Add-connac3-csi-feature.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0113-mtk-wifi-mt76-mt7996-Add-connac3-csi-feature.patch
similarity index 98%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0114-mtk-wifi-mt76-mt7996-Add-connac3-csi-feature.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0113-mtk-wifi-mt76-mt7996-Add-connac3-csi-feature.patch
index 15ec86c..d16fe97 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0114-mtk-wifi-mt76-mt7996-Add-connac3-csi-feature.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0113-mtk-wifi-mt76-mt7996-Add-connac3-csi-feature.patch
@@ -1,7 +1,7 @@
-From e8ef34a080c0c243559a63d029376436ddf11ac8 Mon Sep 17 00:00:00 2001
+From 2601d2a725ebb054774994c20f07287175b94000 Mon Sep 17 00:00:00 2001
 From: mtk20656 <chank.chen@mediatek.com>
 Date: Sat, 20 Jan 2024 12:03:24 +0800
-Subject: [PATCH 114/116] mtk: wifi: mt76: mt7996: Add connac3 csi feature.
+Subject: [PATCH 113/115] mtk: wifi: mt76: mt7996: Add connac3 csi feature.
 
 1. format align to wifi6.
 2. add bw320 support.
@@ -20,7 +20,7 @@
  8 files changed, 910 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 1c8e503..daaf87f 100644
+index 1a0e843..2af5f22 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1053,6 +1053,7 @@ enum {
@@ -40,10 +40,10 @@
  	MCU_UNI_CMD_RRO = 0x57,
  	MCU_UNI_CMD_OFFCH_SCAN_CTRL = 0x58,
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 3af9d02..ff72aab 100644
+index b1aa903..c32f393 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -806,6 +806,24 @@ error:
+@@ -807,6 +807,24 @@ error:
  	return ret;
  }
  
@@ -68,7 +68,7 @@
  static void
  mt7996_unregister_phy(struct mt7996_phy *phy, enum mt76_band_id band)
  {
-@@ -817,6 +835,10 @@ mt7996_unregister_phy(struct mt7996_phy *phy, enum mt76_band_id band)
+@@ -818,6 +836,10 @@ mt7996_unregister_phy(struct mt7996_phy *phy, enum mt76_band_id band)
  	/* TODO: FIXME: temp for single wiphy support */
  	phy->mt76->hw = phy->mt76->ori_hw;
  
@@ -80,7 +80,7 @@
  
  	mphy = phy->dev->mt76.phys[band];
 diff --git a/mt7996/main.c b/mt7996/main.c
-index dcb0b07..35f2495 100644
+index 702968f..cb2cc94 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -1292,6 +1292,9 @@ void mt7996_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0115-mtk-wifi-mt76-mt7996-add-more-debug-info-for-MLO.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0114-mtk-wifi-mt76-mt7996-add-more-debug-info-for-MLO.patch
similarity index 99%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0115-mtk-wifi-mt76-mt7996-add-more-debug-info-for-MLO.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0114-mtk-wifi-mt76-mt7996-add-more-debug-info-for-MLO.patch
index fad0b87..34c2140 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0115-mtk-wifi-mt76-mt7996-add-more-debug-info-for-MLO.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0114-mtk-wifi-mt76-mt7996-add-more-debug-info-for-MLO.patch
@@ -1,7 +1,7 @@
-From 9f8261c0ffa9a1bbe4f810ce39c70c1f8954c60d Mon Sep 17 00:00:00 2001
+From 7676898e5a94d2b8e98deefc05e9848a0b0368fa Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 22 Apr 2024 11:06:48 +0800
-Subject: [PATCH 115/116] mtk: wifi: mt76: mt7996: add more debug info for MLO
+Subject: [PATCH 114/115] mtk: wifi: mt76: mt7996: add more debug info for MLO
 
 ---
  mt76_connac_mcu.c    |    1 +
@@ -17,7 +17,7 @@
  10 files changed, 1847 insertions(+), 9 deletions(-)
 
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 71f3d30..a4924c4 100644
+index 57cfa61..4623f2a 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -433,6 +433,7 @@ void mt76_connac_mcu_sta_basic_tlv(struct mt76_dev *dev, struct sk_buff *skb,
@@ -29,7 +29,7 @@
  }
  EXPORT_SYMBOL_GPL(mt76_connac_mcu_sta_basic_tlv);
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index daaf87f..27bff39 100644
+index 2af5f22..4c14c9e 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1287,6 +1287,7 @@ enum {
@@ -163,7 +163,7 @@
  }
  
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 35f2495..2cc0c32 100644
+index cb2cc94..b489ef2 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -431,6 +431,9 @@ static int mt7996_add_bss_conf(struct mt7996_phy *phy,
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0116-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0115-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
similarity index 90%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0116-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0115-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
index 351cb74..750587b 100644
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0116-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0115-mtk-wifi-mt76-mt7996-remain-multiple-wiphy-model-for.patch
@@ -1,7 +1,7 @@
-From 81a4701e1fb249ce062c5d17e6c670265ef0f05e Mon Sep 17 00:00:00 2001
+From c543ea9535cc5c6e7fac72342d4755ad96567fdd 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 116/116] mtk: wifi: mt76: mt7996: remain multiple wiphy model
+Subject: [PATCH 115/115] mtk: wifi: mt76: mt7996: remain multiple wiphy model
  for testmode
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -12,10 +12,10 @@
  3 files changed, 22 insertions(+), 14 deletions(-)
 
 diff --git a/mt7996/init.c b/mt7996/init.c
-index ff72aab..58944c6 100644
+index c32f393..73a62b7 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -794,9 +794,11 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -795,9 +795,11 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  		mtk_wed_device_start(&dev->mt76.mmio.wed_hif2, MT_INT_TX_RX_DONE_EXT);
  	}
  
@@ -30,7 +30,7 @@
  
  	return 0;
  
-@@ -832,8 +834,9 @@ mt7996_unregister_phy(struct mt7996_phy *phy, enum mt76_band_id band)
+@@ -833,8 +835,9 @@ mt7996_unregister_phy(struct mt7996_phy *phy, enum mt76_band_id band)
  	if (!phy)
  		return;
  
@@ -43,7 +43,7 @@
  #ifdef CONFIG_MTK_VENDOR
  	mt7996_unregister_csi(phy);
 diff --git a/mt7996/main.c b/mt7996/main.c
-index 2cc0c32..9738e76 100644
+index b489ef2..d331818 100644
 --- a/mt7996/main.c
 +++ b/mt7996/main.c
 @@ -140,8 +140,8 @@ static int mt7996_start(struct ieee80211_hw *hw)
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/files/afc_ca.pem b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/files/afc_ca.pem
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/files/afc_ca.pem
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/files/afc_ca.pem
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0001-hostapd-MLO-fix-for_each_mld_link-macro.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0001-hostapd-MLO-fix-for_each_mld_link-macro.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0001-hostapd-MLO-fix-for_each_mld_link-macro.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0001-hostapd-MLO-fix-for_each_mld_link-macro.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0002-hostapd-MLO-frame-link-add-command-on-per-BSS-basis.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0002-hostapd-MLO-frame-link-add-command-on-per-BSS-basis.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0002-hostapd-MLO-frame-link-add-command-on-per-BSS-basis.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0002-hostapd-MLO-frame-link-add-command-on-per-BSS-basis.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0003-nl80211-Print-the-interface-name-in-debug-during-lin.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0003-nl80211-Print-the-interface-name-in-debug-during-lin.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0003-nl80211-Print-the-interface-name-in-debug-during-lin.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0003-nl80211-Print-the-interface-name-in-debug-during-lin.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0004-hostapd-MLO-send-link_id-on-sta_deauth.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0004-hostapd-MLO-send-link_id-on-sta_deauth.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0004-hostapd-MLO-send-link_id-on-sta_deauth.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0004-hostapd-MLO-send-link_id-on-sta_deauth.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0005-hostapd-MLO-handle-auth-assoc-on-link-address.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0005-hostapd-MLO-handle-auth-assoc-on-link-address.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0005-hostapd-MLO-handle-auth-assoc-on-link-address.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0005-hostapd-MLO-handle-auth-assoc-on-link-address.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0006-hostapd-MLO-reset-auth-state-machine-s-ML-info.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0006-hostapd-MLO-reset-auth-state-machine-s-ML-info.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0006-hostapd-MLO-reset-auth-state-machine-s-ML-info.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0006-hostapd-MLO-reset-auth-state-machine-s-ML-info.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0007-hostapd-MLO-add-support-for-cohosted-ML-BSS.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0007-hostapd-MLO-add-support-for-cohosted-ML-BSS.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0007-hostapd-MLO-add-support-for-cohosted-ML-BSS.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0007-hostapd-MLO-add-support-for-cohosted-ML-BSS.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0008-hostapd-MLO-extend-support-for-cohosted-ML-BSS.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0008-hostapd-MLO-extend-support-for-cohosted-ML-BSS.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0008-hostapd-MLO-extend-support-for-cohosted-ML-BSS.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0008-hostapd-MLO-extend-support-for-cohosted-ML-BSS.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0009-hostapd-MLO-pass-link_id-in-get_hapd_bssid-helper-fu.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0009-hostapd-MLO-pass-link_id-in-get_hapd_bssid-helper-fu.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0009-hostapd-MLO-pass-link_id-in-get_hapd_bssid-helper-fu.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0009-hostapd-MLO-pass-link_id-in-get_hapd_bssid-helper-fu.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0010-hostapd-MLO-pass-ctx-in-mlme_event_mgmt.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0010-hostapd-MLO-pass-ctx-in-mlme_event_mgmt.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0010-hostapd-MLO-pass-ctx-in-mlme_event_mgmt.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0010-hostapd-MLO-pass-ctx-in-mlme_event_mgmt.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0011-hostapd-MLO-move-mgmt-and-control-port-Tx-status-to-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0011-hostapd-MLO-move-mgmt-and-control-port-Tx-status-to-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0011-hostapd-MLO-move-mgmt-and-control-port-Tx-status-to-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0011-hostapd-MLO-move-mgmt-and-control-port-Tx-status-to-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0012-hostapd-make-hostapd_eapol_tx_status-function-static.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0012-hostapd-make-hostapd_eapol_tx_status-function-static.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0012-hostapd-make-hostapd_eapol_tx_status-function-static.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0012-hostapd-make-hostapd_eapol_tx_status-function-static.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0013-hostapd-MLO-handle-link_id-in-EAPOL-Tx-status-handle.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0013-hostapd-MLO-handle-link_id-in-EAPOL-Tx-status-handle.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0013-hostapd-MLO-handle-link_id-in-EAPOL-Tx-status-handle.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0013-hostapd-MLO-handle-link_id-in-EAPOL-Tx-status-handle.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0014-hostapd-MLO-update-all-partner-s-link-beacon.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0014-hostapd-MLO-update-all-partner-s-link-beacon.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0014-hostapd-MLO-update-all-partner-s-link-beacon.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0014-hostapd-MLO-update-all-partner-s-link-beacon.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0015-hostapd-MLO-skip-assoc-link-processing-in-ML-info.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0015-hostapd-MLO-skip-assoc-link-processing-in-ML-info.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0015-hostapd-MLO-skip-assoc-link-processing-in-ML-info.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0015-hostapd-MLO-skip-assoc-link-processing-in-ML-info.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0016-hostapd-MLO-Enhance-wpa-state-machine.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0016-hostapd-MLO-Enhance-wpa-state-machine.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0016-hostapd-MLO-Enhance-wpa-state-machine.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0016-hostapd-MLO-Enhance-wpa-state-machine.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0017-hostapd-MLO-add-support-for-MLO-rekey.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0017-hostapd-MLO-add-support-for-MLO-rekey.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0017-hostapd-MLO-add-support-for-MLO-rekey.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0017-hostapd-MLO-add-support-for-MLO-rekey.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0018-hostapd-MLO-send-link-id-during-flushing-stations.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0018-hostapd-MLO-send-link-id-during-flushing-stations.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0018-hostapd-MLO-send-link-id-during-flushing-stations.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0018-hostapd-MLO-send-link-id-during-flushing-stations.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0019-hostapd-MLO-display-link-details-in-status-command.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0019-hostapd-MLO-display-link-details-in-status-command.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0019-hostapd-MLO-display-link-details-in-status-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0019-hostapd-MLO-display-link-details-in-status-command.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0020-hostapd-fix-RNR-building-for-co-location-and-MLO.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0020-hostapd-fix-RNR-building-for-co-location-and-MLO.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0020-hostapd-fix-RNR-building-for-co-location-and-MLO.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0020-hostapd-fix-RNR-building-for-co-location-and-MLO.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0021-tests-MLO-add-basic-cohosted-MLDs-functionality-test.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0021-tests-MLO-add-basic-cohosted-MLDs-functionality-test.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0021-tests-MLO-add-basic-cohosted-MLDs-functionality-test.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0021-tests-MLO-add-basic-cohosted-MLDs-functionality-test.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0022-tests-MLO-add-cohosted-MLDs-connectivity-testing.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0022-tests-MLO-add-cohosted-MLDs-connectivity-testing.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0022-tests-MLO-add-cohosted-MLDs-connectivity-testing.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0022-tests-MLO-add-cohosted-MLDs-connectivity-testing.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0023-backport-hostapd-afcd-add-AFC-daemon-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0023-backport-hostapd-afcd-add-AFC-daemon-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0023-backport-hostapd-afcd-add-AFC-daemon-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0023-backport-hostapd-afcd-add-AFC-daemon-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0024-backport-hostapd-export-hostapd_is_usable_chans-util.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0024-backport-hostapd-export-hostapd_is_usable_chans-util.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0024-backport-hostapd-export-hostapd_is_usable_chans-util.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0024-backport-hostapd-export-hostapd_is_usable_chans-util.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0025-backport-hostapd-ap-add-AFC-client-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0025-backport-hostapd-ap-add-AFC-client-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0025-backport-hostapd-ap-add-AFC-client-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0025-backport-hostapd-ap-add-AFC-client-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0026-backport-hostapd-update-TPE-IE-according-to-AFC.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0026-backport-hostapd-update-TPE-IE-according-to-AFC.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0026-backport-hostapd-update-TPE-IE-according-to-AFC.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0026-backport-hostapd-update-TPE-IE-according-to-AFC.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0027-hostapd-sync-2024-01-18-openwrt-trunk-src-folder.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0027-hostapd-sync-2024-01-18-openwrt-trunk-src-folder.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0027-hostapd-sync-2024-01-18-openwrt-trunk-src-folder.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0027-hostapd-sync-2024-01-18-openwrt-trunk-src-folder.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0028-hostapd-sync-2024-01-18-openwrt-trunk-patch-folder.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0028-hostapd-sync-2024-01-18-openwrt-trunk-patch-folder.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0028-hostapd-sync-2024-01-18-openwrt-trunk-patch-folder.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0028-hostapd-sync-2024-01-18-openwrt-trunk-patch-folder.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0029-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0029-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0029-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0029-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0030-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0030-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0030-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0030-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0031-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0031-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0031-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0031-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0032-mtk-hostapd-Add-mtk_vendor.h.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0032-mtk-hostapd-Add-mtk_vendor.h.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0032-mtk-hostapd-Add-mtk_vendor.h.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0032-mtk-hostapd-Add-mtk_vendor.h.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0033-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0033-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0033-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0033-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0034-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0034-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0034-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0034-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0035-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0035-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0035-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0035-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0036-mtk-hostapd-Add-hostapd-iBF-control.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0036-mtk-hostapd-Add-hostapd-iBF-control.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0036-mtk-hostapd-Add-hostapd-iBF-control.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0036-mtk-hostapd-Add-hostapd-iBF-control.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0037-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0037-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0037-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0037-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0038-mtk-hostapd-Add-DFS-detection-mode.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0038-mtk-hostapd-Add-DFS-detection-mode.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0038-mtk-hostapd-Add-DFS-detection-mode.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0038-mtk-hostapd-Add-DFS-detection-mode.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0039-mtk-hostapd-Add-DFS-offchan-channel-switch.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0039-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0039-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0039-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0040-mtk-hostapd-Add-amsdu-set-get-ctrl.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0040-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0040-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0040-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0041-mtk-hostapd-Add-he_ldpc-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0041-mtk-hostapd-Add-he_ldpc-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0041-mtk-hostapd-Add-he_ldpc-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0041-mtk-hostapd-Add-he_ldpc-configuration.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0042-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0042-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0042-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0042-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0043-mtk-hostapd-6G-band-does-not-require-DFS.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0043-mtk-hostapd-6G-band-does-not-require-DFS.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0043-mtk-hostapd-6G-band-does-not-require-DFS.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0043-mtk-hostapd-6G-band-does-not-require-DFS.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0044-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0044-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0044-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0044-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0045-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0045-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0045-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0045-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0046-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0046-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0046-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0046-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0047-mtk-hostapd-Add-available-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0047-mtk-hostapd-Add-available-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0047-mtk-hostapd-Add-available-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0047-mtk-hostapd-Add-available-color-bitmap.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0048-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0048-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0048-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0048-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0049-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0049-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0049-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0049-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0050-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0050-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0050-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0050-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0051-mtk-hostapd-Add-muru-user-number-debug-command.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0051-mtk-hostapd-Add-muru-user-number-debug-command.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0051-mtk-hostapd-Add-muru-user-number-debug-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0051-mtk-hostapd-Add-muru-user-number-debug-command.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0052-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0052-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0052-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0052-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0053-mtk-hostapd-Add-HE-capabilities-check.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0053-mtk-hostapd-Add-HE-capabilities-check.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0053-mtk-hostapd-Add-HE-capabilities-check.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0053-mtk-hostapd-Add-HE-capabilities-check.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0054-mtk-hostapd-Fix-background-channel-overlapping-opera.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0054-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0054-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0054-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0055-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0055-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0055-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0055-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0056-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0056-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0056-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0056-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0057-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0057-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0057-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0057-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0058-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0058-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0058-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0058-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0059-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0059-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0059-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0059-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0060-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0060-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0060-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0060-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0061-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0061-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0061-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0061-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0062-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0062-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0062-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0062-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0063-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0063-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0063-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0063-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0064-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0064-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0064-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0064-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0065-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0065-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0065-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0065-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0066-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0066-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0066-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0066-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0067-mtk-hostapd-update-eht-operation-element.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0067-mtk-hostapd-update-eht-operation-element.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0067-mtk-hostapd-update-eht-operation-element.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0067-mtk-hostapd-update-eht-operation-element.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0068-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0068-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0068-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0068-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0069-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0069-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0069-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0069-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0070-mtk-hostapd-Add-support-for-updating-background-chan.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0070-mtk-hostapd-Add-support-for-updating-background-chan.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0070-mtk-hostapd-Add-support-for-updating-background-chan.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0070-mtk-hostapd-Add-support-for-updating-background-chan.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0071-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0071-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0071-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0071-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0072-mtk-hostapd-add-support-enable-disable-preamble-punc.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0072-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0072-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0072-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0073-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0073-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0073-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0073-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0074-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0074-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0074-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0074-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0075-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0075-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0075-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0075-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0076-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0076-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0076-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0076-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0077-Revert-ACS-upstream-changes.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0077-Revert-ACS-upstream-changes.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0077-Revert-ACS-upstream-changes.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0077-Revert-ACS-upstream-changes.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0078-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0078-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0078-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0078-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0079-mtk-hostapd-initialize-i802_bss-s-flink-freq-with-if.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0079-mtk-hostapd-initialize-i802_bss-s-flink-freq-with-if.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0079-mtk-hostapd-initialize-i802_bss-s-flink-freq-with-if.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0079-mtk-hostapd-initialize-i802_bss-s-flink-freq-with-if.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0080-mtk-hostapd-fix-mld_assoc_link_id.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0080-mtk-hostapd-fix-mld_assoc_link_id.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0080-mtk-hostapd-fix-mld_assoc_link_id.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0080-mtk-hostapd-fix-mld_assoc_link_id.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0081-mtk-wpa_s-correctly-get-assoc-frequency.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0081-mtk-wpa_s-correctly-get-assoc-frequency.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0081-mtk-wpa_s-correctly-get-assoc-frequency.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0081-mtk-wpa_s-correctly-get-assoc-frequency.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0082-mtk-wpa_s-force-MLD-STA-to-use-SAE-H2E-during-authen.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0082-mtk-wpa_s-force-MLD-STA-to-use-SAE-H2E-during-authen.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0082-mtk-wpa_s-force-MLD-STA-to-use-SAE-H2E-during-authen.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0082-mtk-wpa_s-force-MLD-STA-to-use-SAE-H2E-during-authen.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0083-mtk-hostapd-extend-ap_get_sta-to-find-the-correct-st.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0083-mtk-hostapd-extend-ap_get_sta-to-find-the-correct-st.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0083-mtk-hostapd-extend-ap_get_sta-to-find-the-correct-st.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0083-mtk-hostapd-extend-ap_get_sta-to-find-the-correct-st.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0084-mtk-hostapd-update-cookie-only-when-noack-is-unset.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0084-mtk-hostapd-update-cookie-only-when-noack-is-unset.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0084-mtk-hostapd-update-cookie-only-when-noack-is-unset.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0084-mtk-hostapd-update-cookie-only-when-noack-is-unset.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0085-mtk-wpa_s-fix-bss-selection-when-setting-mld_connect.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0085-mtk-wpa_s-fix-bss-selection-when-setting-mld_connect.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0085-mtk-wpa_s-fix-bss-selection-when-setting-mld_connect.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0085-mtk-wpa_s-fix-bss-selection-when-setting-mld_connect.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0086-mtk-hostapd-add-mld_primary-option.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0086-mtk-hostapd-add-mld_primary-option.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0086-mtk-hostapd-add-mld_primary-option.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0086-mtk-hostapd-add-mld_primary-option.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0087-mtk-wpa_supplicant-add-mld_allowed_phy-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0087-mtk-wpa_supplicant-add-mld_allowed_phy-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0087-mtk-wpa_supplicant-add-mld_allowed_phy-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0087-mtk-wpa_supplicant-add-mld_allowed_phy-configuration.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0088-mtk-hostapd-support-band_idx-option-for-set_mu-get_m.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0088-mtk-hostapd-support-band_idx-option-for-set_mu-get_m.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0088-mtk-hostapd-support-band_idx-option-for-set_mu-get_m.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0088-mtk-hostapd-support-band_idx-option-for-set_mu-get_m.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0089-mtk-hostapd-Handle-DFS-radar-detection-in-MLO.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0089-mtk-hostapd-Handle-DFS-radar-detection-in-MLO.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0089-mtk-hostapd-Handle-DFS-radar-detection-in-MLO.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0089-mtk-hostapd-Handle-DFS-radar-detection-in-MLO.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0090-mtk-hostapd-add-link-id-to-hostapd-cli-chan-switch.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0090-mtk-hostapd-add-link-id-to-hostapd-cli-chan-switch.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0090-mtk-hostapd-add-link-id-to-hostapd-cli-chan-switch.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0090-mtk-hostapd-add-link-id-to-hostapd-cli-chan-switch.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0091-mtk-wifi-hostapd-add-wds-mlo-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0091-mtk-wifi-hostapd-add-wds-mlo-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0091-mtk-wifi-hostapd-add-wds-mlo-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0091-mtk-wifi-hostapd-add-wds-mlo-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0093-mtk-hostapd-prevent-getting-non-MLD-STA-for-other-li.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0093-mtk-hostapd-prevent-getting-non-MLD-STA-for-other-li.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0093-mtk-hostapd-prevent-getting-non-MLD-STA-for-other-li.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0093-mtk-hostapd-prevent-getting-non-MLD-STA-for-other-li.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0094-mtk-hostapd-AP-MLD-specify-link-id-for-unicast-DEAUT.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0094-mtk-hostapd-AP-MLD-specify-link-id-for-unicast-DEAUT.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0094-mtk-hostapd-AP-MLD-specify-link-id-for-unicast-DEAUT.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0094-mtk-hostapd-AP-MLD-specify-link-id-for-unicast-DEAUT.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0095-mtk-hostapd-using-MLD-addr-as-SA-BSSID-for-broadcast.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0095-mtk-hostapd-using-MLD-addr-as-SA-BSSID-for-broadcast.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0095-mtk-hostapd-using-MLD-addr-as-SA-BSSID-for-broadcast.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0095-mtk-hostapd-using-MLD-addr-as-SA-BSSID-for-broadcast.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0096-mtk-hostapd-support-vht-bfee-sts-can-be-up-to-0x4.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0096-mtk-hostapd-support-vht-bfee-sts-can-be-up-to-0x4.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0096-mtk-hostapd-support-vht-bfee-sts-can-be-up-to-0x4.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0096-mtk-hostapd-support-vht-bfee-sts-can-be-up-to-0x4.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0097-mtk-hostapd-fix-issue-that-tx-status-handle-with-unm.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0097-mtk-hostapd-fix-issue-that-tx-status-handle-with-unm.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0097-mtk-hostapd-fix-issue-that-tx-status-handle-with-unm.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0097-mtk-hostapd-fix-issue-that-tx-status-handle-with-unm.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0098-mtk-hostapd-add-connac3-csi-control-interface.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0098-mtk-hostapd-add-connac3-csi-control-interface.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0098-mtk-hostapd-add-connac3-csi-control-interface.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0098-mtk-hostapd-add-connac3-csi-control-interface.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0099-fixup-mtk-wifi-hostapd-add-wds-mlo-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0099-fixup-mtk-wifi-hostapd-add-wds-mlo-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0099-fixup-mtk-wifi-hostapd-add-wds-mlo-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0099-fixup-mtk-wifi-hostapd-add-wds-mlo-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0100-mtk-hostapd-MLD-find-partner-links-by-BSSID-and-SSID.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0100-mtk-hostapd-MLD-find-partner-links-by-BSSID-and-SSID.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0100-mtk-hostapd-MLD-find-partner-links-by-BSSID-and-SSID.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0100-mtk-hostapd-MLD-find-partner-links-by-BSSID-and-SSID.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0101-mtk-hostapd-MLD-hostapd-add-support-for-basic-MLD-Ex.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0101-mtk-hostapd-MLD-hostapd-add-support-for-basic-MLD-Ex.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0101-mtk-hostapd-MLD-hostapd-add-support-for-basic-MLD-Ex.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0101-mtk-hostapd-MLD-hostapd-add-support-for-basic-MLD-Ex.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0102-mtk-hostapd-Refactor-static-PP-and-mld-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0102-mtk-hostapd-Refactor-static-PP-and-mld-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0102-mtk-hostapd-Refactor-static-PP-and-mld-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0102-mtk-hostapd-Refactor-static-PP-and-mld-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0103-mtk-hostapd-make-sure-all-links-are-set-before-enabl.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0103-mtk-hostapd-make-sure-all-links-are-set-before-enabl.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0103-mtk-hostapd-make-sure-all-links-are-set-before-enabl.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0103-mtk-hostapd-make-sure-all-links-are-set-before-enabl.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0104-mtk-hostapd-ucode-add-is_mld_finished-check.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0104-mtk-hostapd-ucode-add-is_mld_finished-check.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0104-mtk-hostapd-ucode-add-is_mld_finished-check.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0104-mtk-hostapd-ucode-add-is_mld_finished-check.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0105-mtk-hostapd-free-station-when-hapd-deinit.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0105-mtk-hostapd-free-station-when-hapd-deinit.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/services/hostapd/patches/0105-mtk-hostapd-free-station-when-hapd-deinit.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/services/hostapd/patches/0105-mtk-hostapd-free-station-when-hapd-deinit.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0001-iw-refactor-frequency-help.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0001-iw-refactor-frequency-help.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0001-iw-refactor-frequency-help.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0001-iw-refactor-frequency-help.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0002-iw-add-puncturing-support.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0002-iw-add-puncturing-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0002-iw-add-puncturing-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0002-iw-add-puncturing-support.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0003-util-clarify-comment-about-parsed-pointer.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0003-util-clarify-comment-about-parsed-pointer.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0003-util-clarify-comment-about-parsed-pointer.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0003-util-clarify-comment-about-parsed-pointer.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0004-iw-remove-sizer-section-and-related-code.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0004-iw-remove-sizer-section-and-related-code.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0004-iw-remove-sizer-section-and-related-code.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0004-iw-remove-sizer-section-and-related-code.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0005-Revert-iw-allow-specifying-CFLAGS-LIBS-externally.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0005-Revert-iw-allow-specifying-CFLAGS-LIBS-externally.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0005-Revert-iw-allow-specifying-CFLAGS-LIBS-externally.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0005-Revert-iw-allow-specifying-CFLAGS-LIBS-externally.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0006-survey-bss-rx-time.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0006-survey-bss-rx-time.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0006-survey-bss-rx-time.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0006-survey-bss-rx-time.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0007-iw-support-link-id-in-set-bitrates-command.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0007-iw-support-link-id-in-set-bitrates-command.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0007-iw-support-link-id-in-set-bitrates-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0007-iw-support-link-id-in-set-bitrates-command.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0008-iw-add-per-link-txpower-config.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0008-iw-add-per-link-txpower-config.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0008-iw-add-per-link-txpower-config.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0008-iw-add-per-link-txpower-config.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0009-mtk-wifi-iw-dump-links-information-in-station-dump.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0009-mtk-wifi-iw-dump-links-information-in-station-dump.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0009-mtk-wifi-iw-dump-links-information-in-station-dump.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0009-mtk-wifi-iw-dump-links-information-in-station-dump.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0010-iw-add-per-radio-antenna-config.patch b/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0010-iw-add-per-radio-antenna-config.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/network/utils/iw/patches/0010-iw-add-per-radio-antenna-config.patch
rename to autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/network/utils/iw/patches/0010-iw-add-per-radio-antenna-config.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/hostapd/0001-hostapd-ucode-mtk-add-parsing-eht_oper-from-hostapd.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0001-hostapd-ucode-mtk-add-parsing-eht_oper-from-hostapd.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/hostapd/0001-hostapd-ucode-mtk-add-parsing-eht_oper-from-hostapd.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0001-hostapd-ucode-mtk-add-parsing-eht_oper-from-hostapd.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/hostapd/0002-hostapd-ucode-mtk-synchronize-bandwidt.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0002-hostapd-ucode-mtk-synchronize-bandwidt.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/hostapd/0002-hostapd-ucode-mtk-synchronize-bandwidt.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0002-hostapd-ucode-mtk-synchronize-bandwidt.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/hostapd/0003-hostapd-add-EHT-config.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0003-hostapd-add-EHT-config.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/hostapd/0003-hostapd-add-EHT-config.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/hostapd/0003-hostapd-add-EHT-config.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0002-busybox-mtk-defconfig.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0002-busybox-mtk-defconfig.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0002-busybox-mtk-defconfig.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0002-busybox-mtk-defconfig.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0003-fstool-mtk-samba-test.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0003-fstool-mtk-samba-test.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0003-fstool-mtk-samba-test.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0003-fstool-mtk-samba-test.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0600-mtd-utils-enable-install-test-load.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0600-mtd-utils-enable-install-test-load.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0600-mtd-utils-enable-install-test-load.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0600-mtd-utils-enable-install-test-load.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0900-sbc-create-related-tools-and-scripts.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0900-sbc-create-related-tools-and-scripts.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0900-sbc-create-related-tools-and-scripts.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0900-sbc-create-related-tools-and-scripts.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-ar-tool.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-ar-tool.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-ar-tool.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-ar-tool.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-cryptsetup.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-cryptsetup.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-cryptsetup.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0901-sbc-build-host-tool-cryptsetup.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0902-sbc-secure-boot-and-anti-rollback-support.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0902-sbc-secure-boot-and-anti-rollback-support.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0902-sbc-secure-boot-and-anti-rollback-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0902-sbc-secure-boot-and-anti-rollback-support.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0903-sbc-make-dm-mod-dax-built-in.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0903-sbc-make-dm-mod-dax-built-in.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0903-sbc-make-dm-mod-dax-built-in.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0903-sbc-make-dm-mod-dax-built-in.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0904-sbc-remove-dm-device-before-sysupgrade.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0904-sbc-remove-dm-device-before-sysupgrade.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0904-sbc-remove-dm-device-before-sysupgrade.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0904-sbc-remove-dm-device-before-sysupgrade.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0905-fix-boot-up-failed.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0905-fix-boot-up-failed.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0905-fix-boot-up-failed.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0905-fix-boot-up-failed.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0906-fsek-build-host-tool-openssl3.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0906-fsek-build-host-tool-openssl3.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0906-fsek-build-host-tool-openssl3.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0906-fsek-build-host-tool-openssl3.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tool-aesgcm.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tool-aesgcm.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tool-aesgcm.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tool-aesgcm.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tools.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tools.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tools.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0907-fsek-build-host-tools.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0908-fsek-build-libuboot-envtools.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0908-fsek-build-libuboot-envtools.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0908-fsek-build-libuboot-envtools.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0908-fsek-build-libuboot-envtools.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0909-fsek-setup-host-scripts.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0909-fsek-setup-host-scripts.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0909-fsek-setup-host-scripts.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0909-fsek-setup-host-scripts.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0910-fsek-encrypt-rfsk-and-patch-dm-crypt.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0910-fsek-encrypt-rfsk-and-patch-dm-crypt.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0910-fsek-encrypt-rfsk-and-patch-dm-crypt.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0910-fsek-encrypt-rfsk-and-patch-dm-crypt.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0911-fsek-encrypt-rootfs.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0911-fsek-encrypt-rootfs.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0911-fsek-encrypt-rootfs.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0911-fsek-encrypt-rootfs.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0912-sbc-upgrade-mkimage-to-2022-07.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0912-sbc-upgrade-mkimage-to-2022-07.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0912-sbc-upgrade-mkimage-to-2022-07.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0912-sbc-upgrade-mkimage-to-2022-07.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0913-sbc-add-offline-sign-support.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0913-sbc-add-offline-sign-support.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0913-sbc-add-offline-sign-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0913-sbc-add-offline-sign-support.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0914-sbc-add-key-algo-option.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0914-sbc-add-key-algo-option.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0914-sbc-add-key-algo-option.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0914-sbc-add-key-algo-option.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0915-append-opteenode-in-kernel-dtb.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0915-append-opteenode-in-kernel-dtb.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/0915-append-opteenode-in-kernel-dtb.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/0915-append-opteenode-in-kernel-dtb.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/8000-uboot-mediatek-makefile.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/8000-uboot-mediatek-makefile.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/8000-uboot-mediatek-makefile.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/8000-uboot-mediatek-makefile.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/8001-uboot-mediatek-remove-old-nand-driver.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/8001-uboot-mediatek-remove-old-nand-driver.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/8001-uboot-mediatek-remove-old-nand-driver.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/8001-uboot-mediatek-remove-old-nand-driver.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/8500-arm-trusted-firmware-mediatek-add-internal-build.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/8500-arm-trusted-firmware-mediatek-add-internal-build.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/mtk_soc/8500-arm-trusted-firmware-mediatek-add-internal-build.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/mtk_soc/8500-arm-trusted-firmware-mediatek-add-internal-build.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-modify-default-values-and-add-EHT-suppo.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-modify-default-values-and-add-EHT-suppo.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-modify-default-values-and-add-EHT-suppo.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0001-wifi-scripts-modify-default-values-and-add-EHT-suppo.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-hostapd-sync-mlo-commit.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-hostapd-sync-mlo-commit.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-hostapd-sync-mlo-commit.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-hostapd-sync-mlo-commit.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-wifi-scripts-add-mlo-config.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-wifi-scripts-add-mlo-config.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-wifi-scripts-add-mlo-config.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0002-wifi-scripts-add-mlo-config.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-hostapd-add-afcd-build-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-hostapd-add-afcd-build-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-hostapd-add-afcd-build-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-hostapd-add-afcd-build-configuration.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-wifi-scripts-add-antenna-config.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-wifi-scripts-add-antenna-config.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-wifi-scripts-add-antenna-config.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0003-wifi-scripts-add-antenna-config.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-hostapd-ucode-add-mlo-support.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-hostapd-ucode-add-mlo-support.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-hostapd-ucode-add-mlo-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-hostapd-ucode-add-mlo-support.patch
diff --git a/autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-wifi-scripts-add-default-mlo-section.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-wifi-scripts-add-default-mlo-section.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-wifi-scripts-add-default-mlo-section.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches-21.02/wifi7_mlo/0004-wifi-scripts-add-default-mlo-section.patch
diff --git a/autobuild_mac80211_release/openwrt_patches/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches/mtk_soc/0001-prefligt-add-cmd-to-speedup-build-image.patch
diff --git a/autobuild_mac80211_release/openwrt_patches/mtk_soc/0002-busybox-mtk-defconfig.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches/mtk_soc/0002-busybox-mtk-defconfig.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches/mtk_soc/0002-busybox-mtk-defconfig.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches/mtk_soc/0002-busybox-mtk-defconfig.patch
diff --git a/autobuild_mac80211_release/openwrt_patches/mtk_soc/0003-fstool-mtk-samba-test.patch b/autobuild/autobuild_5.4_mac80211_release/openwrt_patches/mtk_soc/0003-fstool-mtk-samba-test.patch
similarity index 100%
rename from autobuild_mac80211_release/openwrt_patches/mtk_soc/0003-fstool-mtk-samba-test.patch
rename to autobuild/autobuild_5.4_mac80211_release/openwrt_patches/mtk_soc/0003-fstool-mtk-samba-test.patch
diff --git a/autobuild_mac80211_release/package/firmware/wireless-regdb/patches/600-world-regd-6GHz.patch b/autobuild/autobuild_5.4_mac80211_release/package/firmware/wireless-regdb/patches/600-world-regd-6GHz.patch
similarity index 100%
rename from autobuild_mac80211_release/package/firmware/wireless-regdb/patches/600-world-regd-6GHz.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/firmware/wireless-regdb/patches/600-world-regd-6GHz.patch
diff --git a/autobuild_mac80211_release/package/firmware/wireless-regdb/patches/700-world-regd-5G_UNII-4.patch b/autobuild/autobuild_5.4_mac80211_release/package/firmware/wireless-regdb/patches/700-world-regd-5G_UNII-4.patch
similarity index 100%
rename from autobuild_mac80211_release/package/firmware/wireless-regdb/patches/700-world-regd-5G_UNII-4.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/firmware/wireless-regdb/patches/700-world-regd-5G_UNII-4.patch
diff --git a/autobuild_mac80211_release/package/firmware/wireless-regdb/patches/999-add-country-vv.patch b/autobuild/autobuild_5.4_mac80211_release/package/firmware/wireless-regdb/patches/999-add-country-vv.patch
similarity index 100%
rename from autobuild_mac80211_release/package/firmware/wireless-regdb/patches/999-add-country-vv.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/firmware/wireless-regdb/patches/999-add-country-vv.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/mac80211_v5.15.81_077622a1.tar.gz
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/348-wifi-ieee80211-correctly-mark-FTM-frames-non-buffera.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/348-wifi-ieee80211-correctly-mark-FTM-frames-non-buffera.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/348-wifi-ieee80211-correctly-mark-FTM-frames-non-buffera.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/348-wifi-ieee80211-correctly-mark-FTM-frames-non-buffera.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/349-wifi-mac80211-flush-queues-on-STA-removal.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/349-wifi-mac80211-flush-queues-on-STA-removal.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/349-wifi-mac80211-flush-queues-on-STA-removal.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/349-wifi-mac80211-flush-queues-on-STA-removal.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/350-wifi-iwlwifi-mvm-support-flush-on-AP-interfaces.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/350-wifi-iwlwifi-mvm-support-flush-on-AP-interfaces.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/350-wifi-iwlwifi-mvm-support-flush-on-AP-interfaces.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/350-wifi-iwlwifi-mvm-support-flush-on-AP-interfaces.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/351-wifi-mac80211-add-flush_sta-method.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/351-wifi-mac80211-add-flush_sta-method.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/351-wifi-mac80211-add-flush_sta-method.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/351-wifi-mac80211-add-flush_sta-method.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/352-wifi-iwlwifi-mvm-support-new-flush_sta-method.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/352-wifi-iwlwifi-mvm-support-new-flush_sta-method.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/352-wifi-iwlwifi-mvm-support-new-flush_sta-method.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/352-wifi-iwlwifi-mvm-support-new-flush_sta-method.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/bp-0001-mac80211-backport-add-gfp_t-parameter-to-ieeee80211_.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/bp-0001-mac80211-backport-add-gfp_t-parameter-to-ieeee80211_.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/bp-0001-mac80211-backport-add-gfp_t-parameter-to-ieeee80211_.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/bp-0001-mac80211-backport-add-gfp_t-parameter-to-ieeee80211_.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0001-mac80211-mtk-do-not-setup-twt-when-twt-responder-is-.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0002-cfg80211-mtk-extend-CAC-time-for-weather-radar-chann.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0003-mac80211-mtk-it-s-invalid-case-when-frag_threshold-i.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0004-mac80211-mtk-correct-legacy-rates-check-in-ieee80211.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0005-mac80211-mtk-airtime_flags-depends-on-NL80211_EXT_FE.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0006-mac80211-mtk-add-support-for-runtime-set-inband-disc.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0007-mac80211-mtk-add-s1g-category-to-_ieee80211_is_robus.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0008-mac80211-mtk-make-4addr-null-frames-using-min_rate-f.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0009-cfg80211-mtk-implement-DFS-status-show-cac-and-nop-s.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0010-mac80211-mtk-Set-TWT-Information-Frame-Disabled-bit-.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0011-mac80211-mtk-check-the-control-channel-before-downgr.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0012-mac80211-mtk-fix-tx-amsdu-aggregation.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0013-mac80211-mtk-add-sta-assisted-DFS-state-update-mecha.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0014-nl80211-mtk-Mark-DFS-channel-as-available-for-CSA.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0015-mac80211-mtk-track-obss-color-bitmap.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0016-mac80211-mtk-ageout-color-bitmap.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0017-mac80211-mtk-update-max_bssid_indicator-based-on-rea.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-mtk-support-configurable-addba-resp-time.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-mtk-support-configurable-addba-resp-time.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-mtk-support-configurable-addba-resp-time.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0018-mac80211-mtk-support-configurable-addba-resp-time.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0019-mac80211-mtk-export-ieee80211_tpt_led_trig_tx-rx-for.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0020-cfg80211-mtk-fix-early-return-in-cfg80211_stop_backg.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0020-cfg80211-mtk-fix-early-return-in-cfg80211_stop_backg.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0020-cfg80211-mtk-fix-early-return-in-cfg80211_stop_backg.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0020-cfg80211-mtk-fix-early-return-in-cfg80211_stop_backg.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0021-cfg80211-mtk-add-background-radar-stop-when-backgrou.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0021-cfg80211-mtk-add-background-radar-stop-when-backgrou.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0021-cfg80211-mtk-add-background-radar-stop-when-backgrou.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0021-cfg80211-mtk-add-background-radar-stop-when-backgrou.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0022-mac80211-mtk-avoid-kernel-warning-of-check_flush_dep.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0022-mac80211-mtk-avoid-kernel-warning-of-check_flush_dep.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0022-mac80211-mtk-avoid-kernel-warning-of-check_flush_dep.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0022-mac80211-mtk-avoid-kernel-warning-of-check_flush_dep.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0023-mac80211-mtk-avoid-calling-switch_vif_chanctx-when-u.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0023-mac80211-mtk-avoid-calling-switch_vif_chanctx-when-u.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0023-mac80211-mtk-avoid-calling-switch_vif_chanctx-when-u.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0023-mac80211-mtk-avoid-calling-switch_vif_chanctx-when-u.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-ACS-channel-time-is-reset-by-ch_restore.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-add-DFS-CAC-countdown-in-CSA-flow.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-add-DFS-CAC-countdown-in-CSA-flow.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-add-DFS-CAC-countdown-in-CSA-flow.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0024-mac80211-mtk-add-DFS-CAC-countdown-in-CSA-flow.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0025-mac80211-mtk-send-deauth-frame-if-CAC-is-required-du.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0025-mac80211-mtk-send-deauth-frame-if-CAC-is-required-du.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0025-mac80211-mtk-send-deauth-frame-if-CAC-is-required-du.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0025-mac80211-mtk-send-deauth-frame-if-CAC-is-required-du.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-Add-cert-mode-for-ba-timeout-workaround.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-Add-cert-mode-for-ba-timeout-workaround.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-Add-cert-mode-for-ba-timeout-workaround.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-Add-cert-mode-for-ba-timeout-workaround.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-add-support-for-scan-dwell-time-customi.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-add-support-for-scan-dwell-time-customi.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-add-support-for-scan-dwell-time-customi.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0026-mac80211-mtk-add-support-for-scan-dwell-time-customi.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0027-mac80211-mtk-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0027-mac80211-mtk-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0027-mac80211-mtk-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0027-mac80211-mtk-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0028-mac80211-mtk-backport-refactor-STA-CSA-paring-flow.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0028-mac80211-mtk-backport-refactor-STA-CSA-paring-flow.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0028-mac80211-mtk-backport-refactor-STA-CSA-paring-flow.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0028-mac80211-mtk-backport-refactor-STA-CSA-paring-flow.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0029-mac80211-mtk-send-4-addr-nullfunc-after-drv_event_ca.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0029-mac80211-mtk-send-4-addr-nullfunc-after-drv_event_ca.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0029-mac80211-mtk-send-4-addr-nullfunc-after-drv_event_ca.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0029-mac80211-mtk-send-4-addr-nullfunc-after-drv_event_ca.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0030-mac80211-mtk-fix-incorrect-VIF-assignment-for-IEEE-8.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0030-mac80211-mtk-fix-incorrect-VIF-assignment-for-IEEE-8.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0030-mac80211-mtk-fix-incorrect-VIF-assignment-for-IEEE-8.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0030-mac80211-mtk-fix-incorrect-VIF-assignment-for-IEEE-8.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0031-mac80211-mtk-add-callback-function-to-set-QoS-map-in.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0031-mac80211-mtk-add-callback-function-to-set-QoS-map-in.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0031-mac80211-mtk-add-callback-function-to-set-QoS-map-in.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0031-mac80211-mtk-add-callback-function-to-set-QoS-map-in.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0032-mac80211-mtk-fix-inconsistent-QoS-mapping-between-AP.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0032-mac80211-mtk-fix-inconsistent-QoS-mapping-between-AP.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0032-mac80211-mtk-fix-inconsistent-QoS-mapping-between-AP.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-0032-mac80211-mtk-fix-inconsistent-QoS-mapping-between-AP.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9900-mac80211-mtk-mask-kernel-version-limitation-and-fill.patch
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/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9901-mac80211-mtk-add-fill-receive-path-ops-to-get-wed-id.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9902-mac80211-mtk-add-support-for-letting-drivers-registe.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-mtk-add-per-bss-flag-to-support-vendors-cou.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-mtk-add-per-bss-flag-to-support-vendors-cou.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-mtk-add-per-bss-flag-to-support-vendors-cou.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9903-mac80211-mtk-add-per-bss-flag-to-support-vendors-cou.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9904-mac80211-mtk-add-packet-count-input-for-dev_sw_netst.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9904-mac80211-mtk-add-packet-count-input-for-dev_sw_netst.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9904-mac80211-mtk-add-packet-count-input-for-dev_sw_netst.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211/patches/subsys/mtk-9904-mac80211-mtk-add-packet-count-input-for-dev_sw_netst.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0001-backports-add-SKB_DROP_REASON-and-kfree_skb_reason-b.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0001-backports-add-SKB_DROP_REASON-and-kfree_skb_reason-b.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0001-backports-add-SKB_DROP_REASON-and-kfree_skb_reason-b.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0001-backports-add-SKB_DROP_REASON-and-kfree_skb_reason-b.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0002-backports-update-kernel-version-check-for-eth_hw_add.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0002-backports-update-kernel-version-check-for-eth_hw_add.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0002-backports-update-kernel-version-check-for-eth_hw_add.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0002-backports-update-kernel-version-check-for-eth_hw_add.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0003-backports-Revert-cfg80211-allow-grace-period-for-DFS.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0003-backports-Revert-cfg80211-allow-grace-period-for-DFS.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0003-backports-Revert-cfg80211-allow-grace-period-for-DFS.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/bp-0003-backports-Revert-cfg80211-allow-grace-period-for-DFS.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0001-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0001-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0001-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0001-mtk-mac80211-do-not-setup-twt-when-twt-responder-is-.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0002-mtk-cfg80211-extend-CAC-time-for-weather-radar-chann.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0003-mtk-mac80211-it-s-invalid-case-when-frag_threshold-i.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-mtk-mac80211-add-support-for-runtime-set-inband-disc.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-mtk-mac80211-add-support-for-runtime-set-inband-disc.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-mtk-mac80211-add-support-for-runtime-set-inband-disc.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0004-mtk-mac80211-add-support-for-runtime-set-inband-disc.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0005-mtk-cfg80211-implement-DFS-status-show-cac-and-nop-s.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0006-mtk-mac80211-Set-TWT-Information-Frame-Disabled-bit-.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mtk-mac80211-check-the-control-channel-before-downgr.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mtk-mac80211-check-the-control-channel-before-downgr.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mtk-mac80211-check-the-control-channel-before-downgr.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0007-mtk-mac80211-check-the-control-channel-before-downgr.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-mtk-mac80211-fix-tx-amsdu-aggregation.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-mtk-mac80211-fix-tx-amsdu-aggregation.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-mtk-mac80211-fix-tx-amsdu-aggregation.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0008-mtk-mac80211-fix-tx-amsdu-aggregation.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0009-mtk-mac80211-add-fill-receive-path-ops-to-get-wed-id.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mtk-mac80211-fix-build-error-on-Linux-Kernel-5.4.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mtk-mac80211-fix-build-error-on-Linux-Kernel-5.4.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mtk-mac80211-fix-build-error-on-Linux-Kernel-5.4.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0010-mtk-mac80211-fix-build-error-on-Linux-Kernel-5.4.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mtk-mac80211-track-obss-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mtk-mac80211-track-obss-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mtk-mac80211-track-obss-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0011-mtk-mac80211-track-obss-color-bitmap.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mtk-mac80211-ageout-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mtk-mac80211-ageout-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mtk-mac80211-ageout-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0012-mtk-mac80211-ageout-color-bitmap.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0013-mtk-mac80211-update-max_bssid_indicator-based-on-rea.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mtk-mac80211-support-configurable-addba-resp-time.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mtk-mac80211-support-configurable-addba-resp-time.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mtk-mac80211-support-configurable-addba-resp-time.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0014-mtk-mac80211-support-configurable-addba-resp-time.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0015-mtk-mac80211-add-sta-assisted-DFS-state-update-mecha.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0016-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0016-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0016-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0016-mtk-nl80211-Mark-DFS-channel-as-available-for-CSA.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0017-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0017-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0017-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0017-mtk-cfg80211-fix-early-return-in-cfg80211_stop_backg.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0018-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0018-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0018-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0018-mtk-cfg80211-add-background-radar-stop-when-backgrou.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0019-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0019-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0019-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0019-mtk-mac80211-avoid-kernel-warning-of-check_flush_dep.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0020-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0020-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0020-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0020-mtk-mac80211-avoid-calling-switch_vif_chanctx-when-u.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0021-mtk-mac80211-Add-utilities-for-converting-op_class.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0021-mtk-mac80211-Add-utilities-for-converting-op_class.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0021-mtk-mac80211-Add-utilities-for-converting-op_class.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0021-mtk-mac80211-Add-utilities-for-converting-op_class.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0022-mtk-mac80211-refactor-STA-CSA-parsing-flows.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0022-mtk-mac80211-refactor-STA-CSA-parsing-flows.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0022-mtk-mac80211-refactor-STA-CSA-parsing-flows.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0022-mtk-mac80211-refactor-STA-CSA-parsing-flows.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0023-mtk-mac80211-add-EHT-BA1024-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0023-mtk-mac80211-add-EHT-BA1024-support.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0023-mtk-mac80211-add-EHT-BA1024-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0023-mtk-mac80211-add-EHT-BA1024-support.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0024-mtk-mac80211-add-rate-duration-for-EHT-rate.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0024-mtk-mac80211-add-rate-duration-for-EHT-rate.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0024-mtk-mac80211-add-rate-duration-for-EHT-rate.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0024-mtk-mac80211-add-rate-duration-for-EHT-rate.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0025-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0025-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0025-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0025-mtk-mac80211-add-send-bar-action-when-recieve-addba-.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0026-mtk-mac80211-inrease-beacon-loss-count.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0026-mtk-mac80211-inrease-beacon-loss-count.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0026-mtk-mac80211-inrease-beacon-loss-count.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0026-mtk-mac80211-inrease-beacon-loss-count.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0027-mtk-cfg80211-add-support-for-updating-background-cha.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0027-mtk-cfg80211-add-support-for-updating-background-cha.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0027-mtk-cfg80211-add-support-for-updating-background-cha.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0027-mtk-cfg80211-add-support-for-updating-background-cha.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0028-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0028-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0028-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0028-mtk-mac80211-Allow-STA-interface-to-set-TX-queue-par.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0029-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0029-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0029-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0029-mtk-mac80211-export-ieee80211_tpt_led_trig_tx-rx-for.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0030-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0030-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0030-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0030-mtk-mac80211-add-packet-count-input-for-dev_sw_netst.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0031-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0031-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0031-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0031-mtk-mac80211-add-per-bss-flag-to-support-vendors-cou.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0032-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0032-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0032-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0032-mtk-mac80211-set-eht_support-to-false-when-AP-is-not.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0033-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0033-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0033-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0033-mtk-mac80211-Add-cert-mode-to-disable-ba-timeout.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0034-mtk-mac80211-ACS-channel-time-is-reset-by-ch_restore.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0034-mtk-mac80211-ACS-channel-time-is-reset-by-ch_restore.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0034-mtk-mac80211-ACS-channel-time-is-reset-by-ch_restore.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0034-mtk-mac80211-ACS-channel-time-is-reset-by-ch_restore.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0035-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0035-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0035-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0035-mtk-mac80211-Fix-SMPS-action-frame-cap-check.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0036-mtk-mac80211-Add-CSA-action-frame-tx-when-channel-sw.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0036-mtk-mac80211-Add-CSA-action-frame-tx-when-channel-sw.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0036-mtk-mac80211-Add-CSA-action-frame-tx-when-channel-sw.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0036-mtk-mac80211-Add-CSA-action-frame-tx-when-channel-sw.patch
diff --git a/autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0037-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0037-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0037-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mac80211_dev/patches/subsys/mtk-0037-mtk-mac80211-fix-AP-mgmt-not-encrypted-in-WDS-mode-w.patch
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0001-wifi-mt76-fix-incorrect-HE-TX-GI-report.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0001-wifi-mt76-fix-incorrect-HE-TX-GI-report.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0001-wifi-mt76-fix-incorrect-HE-TX-GI-report.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0001-wifi-mt76-fix-incorrect-HE-TX-GI-report.patch
index 41c0721..01fb995 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0001-wifi-mt76-fix-incorrect-HE-TX-GI-report.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0001-wifi-mt76-fix-incorrect-HE-TX-GI-report.patch
@@ -1,4 +1,4 @@
-From 4621fb4257ade6a4639be6ab8f785e4d8e3bba43 Mon Sep 17 00:00:00 2001
+From 67edc0d71c271793b5ab04338abedaab41b8586e Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Thu, 18 May 2023 18:11:37 +0800
 Subject: [PATCH 01/21] wifi: mt76: fix incorrect HE TX GI report
@@ -17,7 +17,7 @@
  7 files changed, 282 insertions(+), 22 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 2cbea73..92acba9 100644
+index 7dd59db3..bf0770a8 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -282,12 +282,16 @@ struct mt76_queue_ops {
@@ -38,10 +38,10 @@
  	MT_PHY_TYPE_HE_EXT_SU,
  	MT_PHY_TYPE_HE_TB,
 diff --git a/mt7915/init.c b/mt7915/init.c
-index eee1879..edf83c4 100644
+index f1ef965f..888dbf82 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -673,6 +673,8 @@ mt7915_register_ext_phy(struct mt7915_dev *dev, struct mt7915_phy *phy)
+@@ -674,6 +674,8 @@ mt7915_register_ext_phy(struct mt7915_dev *dev, struct mt7915_phy *phy)
  	struct mt76_phy *mphy = phy->mt76;
  	int ret;
  
@@ -50,7 +50,7 @@
  	INIT_DELAYED_WORK(&mphy->mac_work, mt7915_mac_work);
  
  	mt7915_eeprom_parse_hw_cap(dev, phy);
-@@ -1206,6 +1208,8 @@ int mt7915_register_device(struct mt7915_dev *dev)
+@@ -1204,6 +1206,8 @@ int mt7915_register_device(struct mt7915_dev *dev)
  	dev->phy.dev = dev;
  	dev->phy.mt76 = &dev->mt76.phy;
  	dev->mt76.phy.priv = &dev->phy;
@@ -60,7 +60,7 @@
  	INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7915_mac_work);
  	INIT_LIST_HEAD(&dev->sta_rc_list);
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 8008ce3..b915201 100644
+index 8008ce3f..b9152018 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -180,15 +180,7 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)
@@ -188,7 +188,7 @@
  
  	mt76_tx_status_check(mphy->dev, false);
 diff --git a/mt7915/main.c b/mt7915/main.c
-index b16a633..e61041d 100644
+index 2624edbb..b2a6278f 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -752,6 +752,7 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -220,7 +220,7 @@
  
  static void mt7915_tx(struct ieee80211_hw *hw,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index fe54a2f..7df2162 100644
+index 18ba20cf..9774bcce 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -3793,6 +3793,167 @@ out:
@@ -392,7 +392,7 @@
  				struct cfg80211_he_bss_color *he_bss_color)
  {
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index b41ac4a..8f36546 100644
+index b41ac4aa..8f365461 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -152,6 +152,61 @@ struct mt7915_mcu_eeprom_info {
@@ -466,7 +466,7 @@
 +};
  #endif
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index a30d08e..aee30c7 100644
+index a30d08eb..aee30c73 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -137,6 +137,7 @@ struct mt7915_sta {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0002-wifi-mt76-mt7915-add-pc-stack-dump-for-WM-s-coredump.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0002-wifi-mt76-mt7915-add-pc-stack-dump-for-WM-s-coredump.patch
similarity index 98%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0002-wifi-mt76-mt7915-add-pc-stack-dump-for-WM-s-coredump.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0002-wifi-mt76-mt7915-add-pc-stack-dump-for-WM-s-coredump.patch
index 5d62e29..a235b66 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0002-wifi-mt76-mt7915-add-pc-stack-dump-for-WM-s-coredump.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0002-wifi-mt76-mt7915-add-pc-stack-dump-for-WM-s-coredump.patch
@@ -1,4 +1,4 @@
-From c680e5830a6f55b930c2e2e6fdd47f7c957fb656 Mon Sep 17 00:00:00 2001
+From 044f6b5284b02b6f41e91d0e8bfb5a022b43cbf9 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Mon, 22 May 2023 13:49:37 +0800
 Subject: [PATCH 02/21] wifi: mt76: mt7915: add pc stack dump for WM's
@@ -16,7 +16,7 @@
  7 files changed, 207 insertions(+), 71 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 92acba9..ee14425 100644
+index bf0770a8..4fb07877 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -32,6 +32,8 @@
@@ -52,7 +52,7 @@
  	struct net_device napi_dev;
  	struct net_device tx_napi_dev;
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index b35acf8..1ea9798 100644
+index 162c57fb..4baaaacf 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -2941,6 +2941,9 @@ int mt76_connac2_load_ram(struct mt76_dev *dev, const char *fw_wm,
@@ -86,7 +86,7 @@
  		struct mt76_connac2_patch_sec *sec;
  		u32 len, addr, mode;
 diff --git a/mt7915/coredump.c b/mt7915/coredump.c
-index 5daf225..298c1ca 100644
+index 5daf2258..298c1cad 100644
 --- a/mt7915/coredump.c
 +++ b/mt7915/coredump.c
 @@ -7,7 +7,7 @@
@@ -414,7 +414,7 @@
  }
  
 diff --git a/mt7915/coredump.h b/mt7915/coredump.h
-index 709f8e9..809ccbd 100644
+index 709f8e9c..809ccbdf 100644
 --- a/mt7915/coredump.h
 +++ b/mt7915/coredump.h
 @@ -4,6 +4,7 @@
@@ -514,7 +514,7 @@
  	return NULL;
  }
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index b915201..0f6b806 100644
+index b9152018..0f6b8067 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1597,28 +1597,31 @@ void mt7915_mac_reset_work(struct work_struct *work)
@@ -595,7 +595,7 @@
  }
  
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index aee30c7..5cd2b33 100644
+index aee30c73..5cd2b334 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -286,7 +286,7 @@ struct mt7915_dev {
@@ -608,7 +608,7 @@
  #endif
  
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index 89ac8e6..7515b23 100644
+index 89ac8e67..7515b23f 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -1219,4 +1219,24 @@ enum offs_rev {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-move-temperature-margin-check-to-mt.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-move-temperature-margin-check-to-mt.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-move-temperature-margin-check-to-mt.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-move-temperature-margin-check-to-mt.patch
index 4f3c97a..dbb5c3f 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-move-temperature-margin-check-to-mt.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0003-wifi-mt76-mt7915-move-temperature-margin-check-to-mt.patch
@@ -1,4 +1,4 @@
-From 2825cf9ff77fa1065dac5c7a129aad9e8edecdf3 Mon Sep 17 00:00:00 2001
+From c4f870c030edebe27120d87364a213c9f8f7089c Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Thu, 13 Jul 2023 15:50:00 +0800
 Subject: [PATCH 03/21] wifi: mt76: mt7915: move temperature margin check to
@@ -17,10 +17,10 @@
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index edf83c4..9fe0524 100644
+index 888dbf82..3b352fe9 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -83,12 +83,13 @@ static ssize_t mt7915_thermal_temp_store(struct device *dev,
+@@ -84,12 +84,13 @@ static ssize_t mt7915_thermal_temp_store(struct device *dev,
  	mutex_lock(&phy->dev->mt76.mutex);
  	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 60, 130);
  
@@ -38,7 +38,7 @@
  		return -EINVAL;
  	}
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 7df2162..6e9970c 100644
+index 9774bcce..dcf8782a 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -3226,8 +3226,7 @@ int mt7915_mcu_set_thermal_protect(struct mt7915_phy *phy)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0004-wifi-mt76-mt7915-fix-txpower-issues.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0004-wifi-mt76-mt7915-fix-txpower-issues.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0004-wifi-mt76-mt7915-fix-txpower-issues.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0004-wifi-mt76-mt7915-fix-txpower-issues.patch
index a9a5f48..a93ff89 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0004-wifi-mt76-mt7915-fix-txpower-issues.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0004-wifi-mt76-mt7915-fix-txpower-issues.patch
@@ -1,4 +1,4 @@
-From 47f124ba1718259555245eb9c3ad3fb2b4fd0a67 Mon Sep 17 00:00:00 2001
+From 349e821372153fddd6abcd295e50753e5f040f1f Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Sat, 29 Jul 2023 04:53:47 +0800
 Subject: [PATCH 04/21] wifi: mt76: mt7915: fix txpower issues
@@ -10,7 +10,7 @@
  3 files changed, 28 insertions(+), 23 deletions(-)
 
 diff --git a/eeprom.c b/eeprom.c
-index 0bc66cc..ecd09c0 100644
+index 0bc66cc1..ecd09c03 100644
 --- a/eeprom.c
 +++ b/eeprom.c
 @@ -343,7 +343,7 @@ s8 mt76_get_rate_power_limits(struct mt76_phy *phy,
@@ -23,7 +23,7 @@
  
  	if (!mcs_rates)
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 5780138..894e2cd 100644
+index 57801388..894e2cd7 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -951,9 +951,9 @@ mt7915_xmit_queues_show(struct seq_file *file, void *data)
@@ -107,7 +107,7 @@
  	reg = is_mt7915(&dev->mt76) ? MT_WF_PHY_TPC_CTRL_STAT(band) :
  	      MT_WF_PHY_TPC_CTRL_STAT_MT7916(band);
 diff --git a/mt7915/main.c b/mt7915/main.c
-index e61041d..1903db4 100644
+index b2a6278f..a2ad918d 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -1080,6 +1080,7 @@ mt7915_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0005-wifi-mt76-mt7915-Fixed-null-pointer-dereference-issu.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0005-wifi-mt76-mt7915-Fixed-null-pointer-dereference-issu.patch
similarity index 92%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0005-wifi-mt76-mt7915-Fixed-null-pointer-dereference-issu.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0005-wifi-mt76-mt7915-Fixed-null-pointer-dereference-issu.patch
index 07a8d7b..81601e4 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0005-wifi-mt76-mt7915-Fixed-null-pointer-dereference-issu.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0005-wifi-mt76-mt7915-Fixed-null-pointer-dereference-issu.patch
@@ -1,4 +1,4 @@
-From dc0b3bc81859846e1f7bab33eca1212753b4ec1d Mon Sep 17 00:00:00 2001
+From 7b49a07b4440843e3a85c268d3526b410ebf061e Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Thu, 26 Oct 2023 21:11:05 +0800
 Subject: [PATCH 05/21] wifi: mt76: mt7915: Fixed null pointer dereference
@@ -17,7 +17,7 @@
  1 file changed, 7 insertions(+)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 1903db4..61a1dbb 100644
+index a2ad918d..ec2360c3 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -1170,9 +1170,16 @@ static void mt7915_sta_rc_update(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-ACS-channel-time-too-long-on-duty-channel.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-ACS-channel-time-too-long-on-duty-channel.patch
similarity index 87%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-ACS-channel-time-too-long-on-duty-channel.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-ACS-channel-time-too-long-on-duty-channel.patch
index 4bf49da..ac20c29 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-ACS-channel-time-too-long-on-duty-channel.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0006-wifi-mt76-ACS-channel-time-too-long-on-duty-channel.patch
@@ -1,4 +1,4 @@
-From e6a8b61c776db565c532515af002156da38f2f48 Mon Sep 17 00:00:00 2001
+From b6f567e8d4223c309134df14c577f0adee2044bf Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Sat, 18 Nov 2023 07:36:45 +0800
 Subject: [PATCH 06/21] wifi: mt76: ACS channel time too long on duty channel
@@ -26,10 +26,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index e7b763b..bc20f60 100644
+index 94e85ed9..aee6f1e7 100644
 --- a/mac80211.c
 +++ b/mac80211.c
-@@ -927,6 +927,7 @@ void mt76_set_channel(struct mt76_phy *phy)
+@@ -928,6 +928,7 @@ void mt76_set_channel(struct mt76_phy *phy)
  	struct cfg80211_chan_def *chandef = &hw->conf.chandef;
  	bool offchannel = hw->conf.flags & IEEE80211_CONF_OFFCHANNEL;
  	int timeout = HZ / 5;
@@ -37,7 +37,7 @@
  
  	wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(phy), timeout);
  	mt76_update_survey(phy);
-@@ -941,7 +942,7 @@ void mt76_set_channel(struct mt76_phy *phy)
+@@ -942,7 +943,7 @@ void mt76_set_channel(struct mt76_phy *phy)
  	if (!offchannel)
  		phy->main_chan = chandef->chan;
  
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0007-wifi-mt76-mt7915-add-post-channel-switch-for-DFS-cha.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0007-wifi-mt76-mt7915-add-post-channel-switch-for-DFS-cha.patch
similarity index 89%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0007-wifi-mt76-mt7915-add-post-channel-switch-for-DFS-cha.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0007-wifi-mt76-mt7915-add-post-channel-switch-for-DFS-cha.patch
index 8dbeb72..c40f2ae 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0007-wifi-mt76-mt7915-add-post-channel-switch-for-DFS-cha.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0007-wifi-mt76-mt7915-add-post-channel-switch-for-DFS-cha.patch
@@ -1,4 +1,4 @@
-From 96ee52ffd24c36443d93df103b2a856832a41443 Mon Sep 17 00:00:00 2001
+From d5a9af18ab8f2c8c6a46c10ef99f2a50e08ae9c3 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 16 Nov 2023 14:41:54 +0800
 Subject: [PATCH 07/21] wifi: mt76: mt7915: add post channel switch for DFS
@@ -10,7 +10,7 @@
  1 file changed, 22 insertions(+)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 61a1dbb..71e0d55 100644
+index ec2360c3..0d24e74c 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -736,6 +736,27 @@ mt7915_channel_switch_beacon(struct ieee80211_hw *hw,
@@ -41,7 +41,7 @@
  int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
  		       struct ieee80211_sta *sta)
  {
-@@ -1701,6 +1722,7 @@ const struct ieee80211_ops mt7915_ops = {
+@@ -1705,6 +1726,7 @@ const struct ieee80211_ops mt7915_ops = {
  	.get_txpower = mt76_get_txpower,
  	.set_sar_specs = mt7915_set_sar_specs,
  	.channel_switch_beacon = mt7915_channel_switch_beacon,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0008-wifi-mt76-mt7915-add-support-for-realtime-Rx-rate-up.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0008-wifi-mt76-mt7915-add-support-for-realtime-Rx-rate-up.patch
similarity index 92%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0008-wifi-mt76-mt7915-add-support-for-realtime-Rx-rate-up.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0008-wifi-mt76-mt7915-add-support-for-realtime-Rx-rate-up.patch
index 7e82038..a5a0241 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0008-wifi-mt76-mt7915-add-support-for-realtime-Rx-rate-up.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0008-wifi-mt76-mt7915-add-support-for-realtime-Rx-rate-up.patch
@@ -1,4 +1,4 @@
-From 308339254c28af264d9c64f1bc3e29a996d5da12 Mon Sep 17 00:00:00 2001
+From 2b85ea7a8f85c36709442d5ebab72bded582d5cd Mon Sep 17 00:00:00 2001
 From: "Henry.Yen" <henry.yen@mediatek.com>
 Date: Mon, 8 Jan 2024 17:19:01 +0800
 Subject: [PATCH 08/21] wifi: mt76: mt7915: add support for realtime Rx rate
@@ -19,7 +19,7 @@
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/mt76_connac.h b/mt76_connac.h
-index 91987bd..4871857 100644
+index 445d0f0a..5028e49a 100644
 --- a/mt76_connac.h
 +++ b/mt76_connac.h
 @@ -260,6 +260,12 @@ static inline bool is_connac_v1(struct mt76_dev *dev)
@@ -36,7 +36,7 @@
  {
  	switch (mt76_chip(dev)) {
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 71e0d55..5d31f5a 100644
+index 0d24e74c..645d9779 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -1118,7 +1118,7 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0009-wifi-mt76-mt7915-remove-redundant-argument-in-add_be.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0009-wifi-mt76-mt7915-remove-redundant-argument-in-add_be.patch
similarity index 93%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0009-wifi-mt76-mt7915-remove-redundant-argument-in-add_be.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0009-wifi-mt76-mt7915-remove-redundant-argument-in-add_be.patch
index 815103c..9125ae3 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0009-wifi-mt76-mt7915-remove-redundant-argument-in-add_be.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0009-wifi-mt76-mt7915-remove-redundant-argument-in-add_be.patch
@@ -1,4 +1,4 @@
-From 963b2b1d3955ccf2cf4806790c9184e5dfc3e3ea Mon Sep 17 00:00:00 2001
+From bc85ec5a69b6e57eab15c50b54e0603a0829d102 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
 Date: Wed, 24 Jan 2024 15:04:33 +0800
 Subject: [PATCH 09/21] wifi: mt76: mt7915: remove redundant argument in
@@ -15,7 +15,7 @@
  4 files changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 0f6b806..ada3a7f 100644
+index 0f6b8067..ada3a7f4 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1285,8 +1285,7 @@ mt7915_update_vif_beacon(void *priv, u8 *mac, struct ieee80211_vif *vif)
@@ -29,7 +29,7 @@
  	default:
  		break;
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 5d31f5a..9eeca39 100644
+index 645d9779..f0491d66 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -659,7 +659,7 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
@@ -51,7 +51,7 @@
  }
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 6e9970c..84ffe07 100644
+index dcf8782a..a71562fb 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -1970,8 +1970,7 @@ mt7915_mcu_add_inband_discov(struct mt7915_dev *dev, struct ieee80211_vif *vif,
@@ -65,7 +65,7 @@
  	struct mt7915_dev *dev = mt7915_hw_dev(hw);
  	struct mt7915_phy *phy = mt7915_hw_phy(hw);
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 5cd2b33..e1801d5 100644
+index 5cd2b334..e1801d5b 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -461,7 +461,7 @@ int mt7915_mcu_update_bss_color(struct mt7915_dev *dev, struct ieee80211_vif *vi
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0010-wifi-mt76-mt7915-add-support-for-WMM-PBC-configurati.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0010-wifi-mt76-mt7915-add-support-for-WMM-PBC-configurati.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0010-wifi-mt76-mt7915-add-support-for-WMM-PBC-configurati.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0010-wifi-mt76-mt7915-add-support-for-WMM-PBC-configurati.patch
index e508cd1..04fe37e 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0010-wifi-mt76-mt7915-add-support-for-WMM-PBC-configurati.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0010-wifi-mt76-mt7915-add-support-for-WMM-PBC-configurati.patch
@@ -1,4 +1,4 @@
-From 4d8bb032a13e467479bf852a7c72c693814bc11b Mon Sep 17 00:00:00 2001
+From 664d47ddcc7ed90b5d2d73b2040759bf0bf75714 Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Mon, 29 Jan 2024 11:28:41 +0800
 Subject: [PATCH 10/21] wifi: mt76: mt7915: add support for WMM PBC
@@ -14,10 +14,10 @@
  6 files changed, 127 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 67be14d..1dd8244 100644
+index 6873ce14..46dcd1c6 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1025,6 +1025,7 @@ enum {
+@@ -1026,6 +1026,7 @@ enum {
  	MCU_EXT_EVENT_ASSERT_DUMP = 0x23,
  	MCU_EXT_EVENT_RDD_REPORT = 0x3a,
  	MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,
@@ -25,7 +25,7 @@
  	MCU_EXT_EVENT_WA_TX_STAT = 0x74,
  	MCU_EXT_EVENT_BCC_NOTIFY = 0x75,
  	MCU_EXT_EVENT_MURU_CTRL = 0x9f,
-@@ -1220,6 +1221,7 @@ enum {
+@@ -1222,6 +1223,7 @@ enum {
  	MCU_EXT_CMD_TXDPD_CAL = 0x60,
  	MCU_EXT_CMD_CAL_CACHE = 0x67,
  	MCU_EXT_CMD_RED_ENABLE = 0x68,
@@ -34,10 +34,10 @@
  	MCU_EXT_CMD_SET_RADAR_TH = 0x7c,
  	MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d,
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 9fe0524..f81a2f2 100644
+index 3b352fe9..46762827 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -1221,6 +1221,8 @@ int mt7915_register_device(struct mt7915_dev *dev)
+@@ -1219,6 +1219,8 @@ int mt7915_register_device(struct mt7915_dev *dev)
  	INIT_WORK(&dev->dump_work, mt7915_mac_dump_work);
  	mutex_init(&dev->dump_mutex);
  
@@ -47,7 +47,7 @@
  
  	phy2 = mt7915_alloc_ext_phy(dev);
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index ada3a7f..e167e7b 100644
+index ada3a7f4..e167e7b6 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -2032,6 +2032,8 @@ void mt7915_mac_work(struct work_struct *work)
@@ -79,7 +79,7 @@
  
  	if (++phy->stats_work_count == 10) {
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 84ffe07..446c512 100644
+index a71562fb..9126e62f 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -354,6 +354,93 @@ mt7915_mcu_rx_bcc_notify(struct mt7915_dev *dev, struct sk_buff *skb)
@@ -187,7 +187,7 @@
  		break;
  	}
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 8f36546..fa0847d 100644
+index 8f365461..fa0847d5 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -329,10 +329,25 @@ enum {
@@ -217,7 +217,7 @@
  };
  
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index e1801d5..89156f3 100644
+index e1801d5b..89156f35 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -326,6 +326,9 @@ struct mt7915_dev {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0011-wifi-mt76-fix-tx-statistics-about-tx-retry-and-tx-fa.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0011-wifi-mt76-fix-tx-statistics-about-tx-retry-and-tx-fa.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0011-wifi-mt76-fix-tx-statistics-about-tx-retry-and-tx-fa.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0011-wifi-mt76-fix-tx-statistics-about-tx-retry-and-tx-fa.patch
index 9837869..238b452 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0011-wifi-mt76-fix-tx-statistics-about-tx-retry-and-tx-fa.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0011-wifi-mt76-fix-tx-statistics-about-tx-retry-and-tx-fa.patch
@@ -1,4 +1,4 @@
-From 99458375f8a646403eed7c259d05ff3e47e892b6 Mon Sep 17 00:00:00 2001
+From 1587828e06491339654d20dea3382749fde143ed Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 29 Jan 2024 11:02:06 +0800
 Subject: [PATCH 11/21] wifi: mt76: fix tx statistics about tx retry and tx
@@ -13,7 +13,7 @@
  2 files changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index b841bf6..630c640 100644
+index b841bf62..630c6402 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -716,9 +716,6 @@ bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,
@@ -27,7 +27,7 @@
  	skb = mt76_tx_status_skb_get(dev, wcid, pid, &list);
  	if (skb) {
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index e167e7b..a5d0b09 100644
+index e167e7b6..a5d0b096 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1021,7 +1021,7 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0012-wifi-mt76-add-sanity-check-to-prevent-kernel-crash.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0012-wifi-mt76-add-sanity-check-to-prevent-kernel-crash.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0012-wifi-mt76-add-sanity-check-to-prevent-kernel-crash.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0012-wifi-mt76-add-sanity-check-to-prevent-kernel-crash.patch
index d225e02..576cf69 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0012-wifi-mt76-add-sanity-check-to-prevent-kernel-crash.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0012-wifi-mt76-add-sanity-check-to-prevent-kernel-crash.patch
@@ -1,4 +1,4 @@
-From 8bcee1da876907d67de94317dcd343842a54921f Mon Sep 17 00:00:00 2001
+From 65092f531e1319ed6ddb25e982393eddccb781b5 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 29 Jan 2024 15:33:24 +0800
 Subject: [PATCH 12/21] wifi: mt76: add sanity check to prevent kernel crash
@@ -12,7 +12,7 @@
  1 file changed, 8 insertions(+)
 
 diff --git a/tx.c b/tx.c
-index 5cf6ede..ab42f69 100644
+index 5cf6edee..ab42f69b 100644
 --- a/tx.c
 +++ b/tx.c
 @@ -345,6 +345,14 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0013-wifi-mt76-mt7915-limit-per-band-token-count.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0013-wifi-mt76-mt7915-limit-per-band-token-count.patch
similarity index 91%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0013-wifi-mt76-mt7915-limit-per-band-token-count.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0013-wifi-mt76-mt7915-limit-per-band-token-count.patch
index 6d59422..167f36c 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0013-wifi-mt76-mt7915-limit-per-band-token-count.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0013-wifi-mt76-mt7915-limit-per-band-token-count.patch
@@ -1,4 +1,4 @@
-From ed564a0fe9b656b67eafc74c63aa747b43c49580 Mon Sep 17 00:00:00 2001
+From a2f8deaaf6a97b0157e49ec476b003ef1dd234f8 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 29 Jan 2024 15:33:24 +0800
 Subject: [PATCH 13/21] wifi: mt76: mt7915: limit per-band token count
@@ -20,7 +20,7 @@
  9 files changed, 41 insertions(+), 7 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index ee14425..b83456b 100644
+index 4fb07877..05ee568c 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -407,6 +407,8 @@ struct mt76_txwi_cache {
@@ -49,7 +49,7 @@
  
  	spinlock_t rx_token_lock;
  	struct idr rx_token;
-@@ -1662,7 +1667,8 @@ static inline bool mt76_queue_is_wed_rx(struct mt76_queue *q)
+@@ -1674,7 +1679,8 @@ static inline bool mt76_queue_is_wed_rx(struct mt76_queue *q)
  
  struct mt76_txwi_cache *
  mt76_token_release(struct mt76_dev *dev, int token, bool *wake);
@@ -60,7 +60,7 @@
  struct mt76_txwi_cache *mt76_rx_token_release(struct mt76_dev *dev, int token);
  int mt76_rx_token_consume(struct mt76_dev *dev, void *ptr,
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index 630c640..a92c261 100644
+index 630c6402..a92c261d 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -1178,6 +1178,8 @@ void mt76_connac2_tx_token_put(struct mt76_dev *dev)
@@ -73,10 +73,10 @@
  	spin_unlock_bh(&dev->token_lock);
  	idr_destroy(&dev->token);
 diff --git a/mt7915/init.c b/mt7915/init.c
-index f81a2f2..3ec9eab 100644
+index 46762827..ea9bc735 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -1225,6 +1225,8 @@ int mt7915_register_device(struct mt7915_dev *dev)
+@@ -1223,6 +1223,8 @@ int mt7915_register_device(struct mt7915_dev *dev)
  
  	dev->dbdc_support = mt7915_band_config(dev);
  
@@ -85,7 +85,7 @@
  	phy2 = mt7915_alloc_ext_phy(dev);
  	if (IS_ERR(phy2))
  		return PTR_ERR(phy2);
-@@ -1257,6 +1259,7 @@ int mt7915_register_device(struct mt7915_dev *dev)
+@@ -1255,6 +1257,7 @@ int mt7915_register_device(struct mt7915_dev *dev)
  	}
  
  	dev->recovery.hw_init_done = true;
@@ -94,7 +94,7 @@
  	ret = mt7915_init_debugfs(&dev->phy);
  	if (ret)
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index a5d0b09..4604a68 100644
+index a5d0b096..4604a682 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -738,6 +738,7 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -115,7 +115,7 @@
  		return id;
  
 diff --git a/mt7921/pci_mac.c b/mt7921/pci_mac.c
-index 031ba9a..4c69c55 100644
+index 031ba9aa..4c69c55c 100644
 --- a/mt7921/pci_mac.c
 +++ b/mt7921/pci_mac.c
 @@ -27,7 +27,7 @@ int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -128,7 +128,7 @@
  		return id;
  
 diff --git a/mt7925/pci_mac.c b/mt7925/pci_mac.c
-index 9fca887..f1d615c 100644
+index 9fca8879..f1d615c0 100644
 --- a/mt7925/pci_mac.c
 +++ b/mt7925/pci_mac.c
 @@ -27,7 +27,7 @@ int mt7925e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -141,10 +141,10 @@
  		return id;
  
 diff --git a/mt7996/init.c b/mt7996/init.c
-index 9aa97e4..7549a10 100644
+index 283df84f..d191a7b7 100644
 --- a/mt7996/init.c
 +++ b/mt7996/init.c
-@@ -634,6 +634,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
+@@ -635,6 +635,8 @@ static int mt7996_register_phy(struct mt7996_dev *dev, struct mt7996_phy *phy,
  		mtk_wed_device_start(&dev->mt76.mmio.wed_hif2, irq_mask);
  	}
  
@@ -171,7 +171,7 @@
  	if (ret)
  		goto error;
 diff --git a/mt7996/mac.c b/mt7996/mac.c
-index bc7111a..aa19120 100644
+index bc7111a7..aa19120b 100644
 --- a/mt7996/mac.c
 +++ b/mt7996/mac.c
 @@ -922,6 +922,7 @@ int mt7996_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -192,7 +192,7 @@
  		return id;
  
 diff --git a/tx.c b/tx.c
-index ab42f69..0fdf7d8 100644
+index ab42f69b..0fdf7d83 100644
 --- a/tx.c
 +++ b/tx.c
 @@ -825,16 +825,30 @@ void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0014-wifi-mt76-mt7915-update-power-on-sequence.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0014-wifi-mt76-mt7915-update-power-on-sequence.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0014-wifi-mt76-mt7915-update-power-on-sequence.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0014-wifi-mt76-mt7915-update-power-on-sequence.patch
index d12aa99..5f53feb 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0014-wifi-mt76-mt7915-update-power-on-sequence.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0014-wifi-mt76-mt7915-update-power-on-sequence.patch
@@ -1,4 +1,4 @@
-From 24535c7fc954e8122a792a28bd7c8fd77887c4b8 Mon Sep 17 00:00:00 2001
+From 55dd46f8caed3d8baa6819d884a1e82c496083f5 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Thu, 14 Mar 2024 17:55:12 +0800
 Subject: [PATCH 14/21] wifi: mt76: mt7915: update power on sequence
@@ -13,7 +13,7 @@
  3 files changed, 48 insertions(+), 2 deletions(-)
 
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 89156f3..74cd8ca 100644
+index 89156f35..74cd8caf 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -329,6 +329,7 @@ struct mt7915_dev {
@@ -25,7 +25,7 @@
  
  enum {
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index 7515b23..3452a7e 100644
+index 7515b23f..3452a7e9 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -775,6 +775,7 @@ enum offs_rev {
@@ -45,7 +45,7 @@
  /* ADIE */
  #define MT_ADIE_CHIP_ID			0x02c
 diff --git a/mt7915/soc.c b/mt7915/soc.c
-index 92d8d71..bb3468a 100644
+index 92d8d710..bb3468a9 100644
 --- a/mt7915/soc.c
 +++ b/mt7915/soc.c
 @@ -260,6 +260,7 @@ static int mt7986_wmac_consys_lockup(struct mt7915_dev *dev, bool enable)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0015-wifi-mt76-mt7915-add-support-for-IEEE-802.11-fragmen.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0015-wifi-mt76-mt7915-add-support-for-IEEE-802.11-fragmen.patch
similarity index 93%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0015-wifi-mt76-mt7915-add-support-for-IEEE-802.11-fragmen.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0015-wifi-mt76-mt7915-add-support-for-IEEE-802.11-fragmen.patch
index 067716d..c28e51e 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0015-wifi-mt76-mt7915-add-support-for-IEEE-802.11-fragmen.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0015-wifi-mt76-mt7915-add-support-for-IEEE-802.11-fragmen.patch
@@ -1,4 +1,4 @@
-From 9be5cee24e12846873cc8b2f7b3166043f47a8dc Mon Sep 17 00:00:00 2001
+From 22225104ac30af79661bf46c04e8c9523c2d22fd Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Wed, 3 Apr 2024 14:05:59 +0800
 Subject: [PATCH 15/21] wifi: mt76: mt7915: add support for IEEE 802.11
@@ -13,7 +13,7 @@
  2 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/mt76_connac2_mac.h b/mt76_connac2_mac.h
-index 5f13211..eb47653 100644
+index 5f132115..eb476536 100644
 --- a/mt76_connac2_mac.h
 +++ b/mt76_connac2_mac.h
 @@ -355,4 +355,11 @@ enum tx_port_idx {
@@ -29,7 +29,7 @@
 +
  #endif /* __MT76_CONNAC2_MAC_H */
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index a92c261..170ef36 100644
+index a92c261d..170ef367 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -391,6 +391,7 @@ mt76_connac2_mac_write_txwi_80211(struct mt76_dev *dev, __le32 *txwi,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0016-wifi-mt76-mt7915-add-dummy-HW-offload-of-IEEE-802.11.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0016-wifi-mt76-mt7915-add-dummy-HW-offload-of-IEEE-802.11.patch
similarity index 85%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0016-wifi-mt76-mt7915-add-dummy-HW-offload-of-IEEE-802.11.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0016-wifi-mt76-mt7915-add-dummy-HW-offload-of-IEEE-802.11.patch
index 78d9d87..d1a11c4 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0016-wifi-mt76-mt7915-add-dummy-HW-offload-of-IEEE-802.11.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0016-wifi-mt76-mt7915-add-dummy-HW-offload-of-IEEE-802.11.patch
@@ -1,4 +1,4 @@
-From b8a7bf6451dd612803743b69209672186bb09f6f Mon Sep 17 00:00:00 2001
+From 9db10864ac1dbdc802e563fc6d8752c8b275c302 Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Wed, 17 Apr 2024 10:47:08 +0800
 Subject: [PATCH 16/21] wifi: mt76: mt7915: add dummy HW offload of IEEE 802.11
@@ -14,10 +14,10 @@
  2 files changed, 8 insertions(+)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 3ec9eab..19a68c5 100644
+index ea9bc735..470b198a 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -398,6 +398,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+@@ -399,6 +399,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
  	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);
  	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
  	ieee80211_hw_set(hw, WANT_MONITOR_VIF);
@@ -26,7 +26,7 @@
  	hw->max_tx_fragments = 4;
  
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 9eeca39..65a3ce0 100644
+index f0491d66..f4673c8d 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -1614,6 +1614,12 @@ mt7915_twt_teardown_request(struct ieee80211_hw *hw,
@@ -42,7 +42,7 @@
  static int
  mt7915_set_radar_background(struct ieee80211_hw *hw,
  			    struct cfg80211_chan_def *chandef)
-@@ -1741,6 +1747,7 @@ const struct ieee80211_ops mt7915_ops = {
+@@ -1745,6 +1751,7 @@ const struct ieee80211_ops mt7915_ops = {
  	.sta_set_decap_offload = mt7915_sta_set_decap_offload,
  	.add_twt_setup = mt7915_mac_add_twt_setup,
  	.twt_teardown_request = mt7915_twt_teardown_request,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0017-wifi-mt76-mt7915-fix-rx-filter-setting-for-bfee-func.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0017-wifi-mt76-mt7915-fix-rx-filter-setting-for-bfee-func.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0017-wifi-mt76-mt7915-fix-rx-filter-setting-for-bfee-func.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0017-wifi-mt76-mt7915-fix-rx-filter-setting-for-bfee-func.patch
index d4ad3a7..706b107 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0017-wifi-mt76-mt7915-fix-rx-filter-setting-for-bfee-func.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0017-wifi-mt76-mt7915-fix-rx-filter-setting-for-bfee-func.patch
@@ -1,4 +1,4 @@
-From f7a49dfa1f56157ea7d0d433fa6a06b12a98f46b Mon Sep 17 00:00:00 2001
+From d0d40f91383444dce590d39157d05f4922102db3 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Fri, 12 Apr 2024 11:33:08 +0800
 Subject: [PATCH 17/21] wifi: mt76: mt7915: fix rx filter setting for bfee
@@ -14,7 +14,7 @@
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 65a3ce0..5ed84bc 100644
+index f4673c8d..f40a9007 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -564,8 +564,7 @@ static void mt7915_configure_filter(struct ieee80211_hw *hw,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0018-wifi-mt76-mt7915-fix-inconsistent-QoS-mapping-betwee.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0018-wifi-mt76-mt7915-fix-inconsistent-QoS-mapping-betwee.patch
similarity index 89%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0018-wifi-mt76-mt7915-fix-inconsistent-QoS-mapping-betwee.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0018-wifi-mt76-mt7915-fix-inconsistent-QoS-mapping-betwee.patch
index c871c60..5d43e47 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0018-wifi-mt76-mt7915-fix-inconsistent-QoS-mapping-betwee.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0018-wifi-mt76-mt7915-fix-inconsistent-QoS-mapping-betwee.patch
@@ -1,8 +1,8 @@
-From 5fd6278fa4d62c140f40fe2d7ae0bd86074b2d36 Mon Sep 17 00:00:00 2001
+From e136a8aafc7ee1a3b39c698491b9c2b6f4dfb87b Mon Sep 17 00:00:00 2001
 From: Benjamin Lin <benjamin-jw.lin@mediatek.com>
 Date: Thu, 25 Apr 2024 17:17:13 +0800
-Subject: [PATCH] wifi: mt76: mt7915: fix inconsistent QoS mapping between SW
- and HW
+Subject: [PATCH 18/21] wifi: mt76: mt7915: fix inconsistent QoS mapping
+ between SW and HW
 
 The mapping from IP DSCP to IEEE 802.11 user priority may be customized.
 Therefore, the mapping needs to be passed to HW, so that the QoS type of traffic can be mapped in a consistent manner for both SW and HW paths.
@@ -14,7 +14,7 @@
  2 files changed, 45 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 8899eea..5c25f1a 100644
+index 46dcd1c6..e0255a23 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1238,6 +1238,7 @@ enum {
@@ -26,7 +26,7 @@
  
  enum {
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 5ed84bc..be11e4f 100644
+index f40a9007..3a8b9404 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -1619,6 +1619,49 @@ mt7915_set_frag_threshold(struct ieee80211_hw *hw, u32 val)
@@ -79,7 +79,7 @@
  static int
  mt7915_set_radar_background(struct ieee80211_hw *hw,
  			    struct cfg80211_chan_def *chandef)
-@@ -1747,6 +1790,7 @@ const struct ieee80211_ops mt7915_ops = {
+@@ -1751,6 +1794,7 @@ const struct ieee80211_ops mt7915_ops = {
  	.add_twt_setup = mt7915_mac_add_twt_setup,
  	.twt_teardown_request = mt7915_twt_teardown_request,
  	.set_frag_threshold = mt7915_set_frag_threshold,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0019-wifi-mt76-mt7915-adjust-rx-filter.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0019-wifi-mt76-mt7915-adjust-rx-filter.patch
similarity index 94%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0019-wifi-mt76-mt7915-adjust-rx-filter.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0019-wifi-mt76-mt7915-adjust-rx-filter.patch
index beeeaf9..aebc44f 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0019-wifi-mt76-mt7915-adjust-rx-filter.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0019-wifi-mt76-mt7915-adjust-rx-filter.patch
@@ -1,4 +1,4 @@
-From 304c98810a9e68eccae433c570d1fc7c1063a641 Mon Sep 17 00:00:00 2001
+From d189b10ff8b7cd3d6fdabde17e8476bfe66466cc Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Fri, 19 Apr 2024 15:43:23 +0800
 Subject: [PATCH 19/21] wifi: mt76: mt7915: adjust rx filter
@@ -13,7 +13,7 @@
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index c6880ca..3783849 100644
+index 3a8b9404..0d2614e1 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -489,7 +489,8 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0020-wifi-mt76-mt7915-add-additional-chain-signal-info-to.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0020-wifi-mt76-mt7915-add-additional-chain-signal-info-to.patch
similarity index 89%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0020-wifi-mt76-mt7915-add-additional-chain-signal-info-to.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0020-wifi-mt76-mt7915-add-additional-chain-signal-info-to.patch
index 76573f5..7b3b464 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0020-wifi-mt76-mt7915-add-additional-chain-signal-info-to.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0020-wifi-mt76-mt7915-add-additional-chain-signal-info-to.patch
@@ -1,4 +1,4 @@
-From 6fb263d127c9ef802b4256e95ccea2d2faa047b4 Mon Sep 17 00:00:00 2001
+From cab458a1d2d91784aa28bacfd0b6649fd5c3f740 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 20 Sep 2023 11:10:57 +0800
 Subject: [PATCH 20/21] wifi: mt76: mt7915: add additional chain signal info to
@@ -10,7 +10,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 4604a68..95c794a 100644
+index 4604a682..95c794a3 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -437,7 +437,7 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
similarity index 92%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
index 1f9d540..b318b8c 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0021-wifi-mt76-mt7915-remove-unnecessary-register-setting.patch
@@ -1,7 +1,8 @@
-From 1af0fe3345f26594c78e91681997ad3a1838fc7c Mon Sep 17 00:00:00 2001
+From 9976288a87664bacf514902869be38215da1d8b1 Mon Sep 17 00:00:00 2001
 From: Henry Yen <henry.yen@mediatek.com>
 Date: Wed, 6 Mar 2024 12:42:06 +0800
-Subject: [PATCH] wifi: mt76: mt7915: remove unnecessary register settings
+Subject: [PATCH 21/21] wifi: mt76: mt7915: remove unnecessary register
+ settings
 
 Remove unnecessary register settings from the driver layer,
 and let firmware take over the configuration control.
@@ -13,10 +14,10 @@
  2 files changed, 1 insertion(+), 72 deletions(-)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 19a68c5..15ae27a 100644
+index 470b198a..84c69a88 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -475,30 +475,6 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)
+@@ -476,30 +476,6 @@ mt7915_mac_init_band(struct mt7915_dev *dev, u8 band)
  {
  	u32 mask, set;
  
@@ -47,7 +48,7 @@
  	/* mt7915: disable rx rate report by default due to hw issues */
  	mt76_clear(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN);
  
-@@ -601,23 +577,17 @@ mt7915_init_led_mux(struct mt7915_dev *dev)
+@@ -602,23 +578,17 @@ mt7915_init_led_mux(struct mt7915_dev *dev)
  void mt7915_mac_init(struct mt7915_dev *dev)
  {
  	int i;
@@ -72,7 +73,7 @@
  		mt7915_mac_wtbl_update(dev, i,
  				       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 95c794a..1c5ab41 100644
+index 95c794a3..1c5ab41f 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1149,61 +1149,20 @@ void mt7915_mac_reset_counters(struct mt7915_phy *phy)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/0999-wifi-mt76-mt7915-build-pass-for-Linux-Kernel-5.4-fix.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0999-wifi-mt76-mt7915-build-pass-for-Linux-Kernel-5.4-fix.patch
similarity index 94%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/0999-wifi-mt76-mt7915-build-pass-for-Linux-Kernel-5.4-fix.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0999-wifi-mt76-mt7915-build-pass-for-Linux-Kernel-5.4-fix.patch
index 53a0fc9..1f9477c 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/0999-wifi-mt76-mt7915-build-pass-for-Linux-Kernel-5.4-fix.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/0999-wifi-mt76-mt7915-build-pass-for-Linux-Kernel-5.4-fix.patch
@@ -1,7 +1,7 @@
-From e3da91079dacc07f8e011f4b469e70bd78a93636 Mon Sep 17 00:00:00 2001
+From 4cdf382808962e209db2575b74d5fde2d2e7ac72 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Sat, 1 Apr 2023 08:18:17 +0800
-Subject: [PATCH 0999/1051] wifi: mt76: mt7915: build pass for Linux Kernel 5.4
+Subject: [PATCH 0999/1052] wifi: mt76: mt7915: build pass for Linux Kernel 5.4
  fixes
 
 ---
@@ -23,7 +23,7 @@
  15 files changed, 123 insertions(+), 232 deletions(-)
 
 diff --git a/debugfs.c b/debugfs.c
-index c4649ba..1c8328d 100644
+index c4649ba0..1c8328d5 100644
 --- a/debugfs.c
 +++ b/debugfs.c
 @@ -33,8 +33,10 @@ mt76_napi_threaded_set(void *data, u64 val)
@@ -38,7 +38,7 @@
  	return 0;
  }
 diff --git a/dma.c b/dma.c
-index f4f88c4..ccdd564 100644
+index f4f88c44..ccdd5646 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -178,7 +178,7 @@ mt76_free_pending_rxwi(struct mt76_dev *dev)
@@ -240,7 +240,7 @@
  
  	if (mtk_wed_device_active(&dev->mmio.wed))
 diff --git a/dma.h b/dma.h
-index 1de5a2b..619dc0f 100644
+index 1de5a2b2..619dc0fe 100644
 --- a/dma.h
 +++ b/dma.h
 @@ -79,8 +79,7 @@ enum mt76_dma_wed_ind_reason {
@@ -254,7 +254,7 @@
  			    bool reset_idx);
  void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q);
 diff --git a/eeprom.c b/eeprom.c
-index ecd09c0..a267397 100644
+index ecd09c03..a2673978 100644
 --- a/eeprom.c
 +++ b/eeprom.c
 @@ -163,9 +163,15 @@ void
@@ -275,10 +275,10 @@
  	if (!is_valid_ether_addr(phy->macaddr)) {
  		eth_random_addr(phy->macaddr);
 diff --git a/mac80211.c b/mac80211.c
-index bc20f60..b30a74e 100644
+index aee6f1e7..4d50bfae 100644
 --- a/mac80211.c
 +++ b/mac80211.c
-@@ -577,47 +577,6 @@ void mt76_unregister_phy(struct mt76_phy *phy)
+@@ -578,47 +578,6 @@ void mt76_unregister_phy(struct mt76_phy *phy)
  }
  EXPORT_SYMBOL_GPL(mt76_unregister_phy);
  
@@ -326,7 +326,7 @@
  struct mt76_dev *
  mt76_alloc_device(struct device *pdev, unsigned int size,
  		  const struct ieee80211_ops *ops,
-@@ -1817,21 +1776,6 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
+@@ -1818,21 +1777,6 @@ void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
  }
  EXPORT_SYMBOL_GPL(mt76_ethtool_worker);
  
@@ -349,7 +349,7 @@
  {
  	struct ieee80211_hw *hw = phy->hw;
 diff --git a/mcu.c b/mcu.c
-index a8cafa3..fa4b054 100644
+index a8cafa39..fa4b0544 100644
 --- a/mcu.c
 +++ b/mcu.c
 @@ -4,6 +4,7 @@
@@ -361,7 +361,7 @@
  struct sk_buff *
  __mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,
 diff --git a/mt76.h b/mt76.h
-index b83456b..a07c7df 100644
+index 05ee568c..063fc364 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -15,11 +15,6 @@
@@ -393,7 +393,7 @@
  void mt76_ethtool_worker(struct mt76_ethtool_worker_info *wi,
  			 struct mt76_sta_stats *stats, bool eht);
  int mt76_skb_adjust_pad(struct sk_buff *skb, int pad);
-@@ -1673,25 +1667,6 @@ void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked);
+@@ -1685,25 +1679,6 @@ void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked);
  struct mt76_txwi_cache *mt76_rx_token_release(struct mt76_dev *dev, int token);
  int mt76_rx_token_consume(struct mt76_dev *dev, void *ptr,
  			  struct mt76_txwi_cache *r, dma_addr_t phys);
@@ -420,7 +420,7 @@
  static inline void mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked)
  {
 diff --git a/mt7615/mcu.c b/mt7615/mcu.c
-index ae34d01..c9444c6 100644
+index c807bd8d..a9310660 100644
 --- a/mt7615/mcu.c
 +++ b/mt7615/mcu.c
 @@ -10,6 +10,7 @@
@@ -432,7 +432,7 @@
  static bool prefer_offload_fw = true;
  module_param(prefer_offload_fw, bool, 0644);
 diff --git a/mt76_connac.h b/mt76_connac.h
-index 4871857..8e7068c 100644
+index 5028e49a..5356c52c 100644
 --- a/mt76_connac.h
 +++ b/mt76_connac.h
 @@ -56,7 +56,6 @@ enum {
@@ -452,7 +452,7 @@
  
  	if (chandef->width >= ARRAY_SIZE(width_to_bw))
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 1ea9798..a8f097d 100644
+index 4baaaacf..4e84f8d2 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -4,6 +4,7 @@
@@ -524,10 +524,10 @@
  #define DEFAULT_HE_DURATION_RTS_THRES	1023
  static void
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 0936c1c..99cdd1b 100644
+index e0255a23..abc57f18 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1985,12 +1985,8 @@ void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);
+@@ -1992,12 +1992,8 @@ void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);
  
  const struct ieee80211_sta_he_cap *
  mt76_connac_get_he_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif);
@@ -541,7 +541,7 @@
  int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
  			    struct mt76_connac_sta_key_conf *sta_key_conf,
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 3783849..1da1d32 100644
+index 0d2614e1..a3facc9a 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -1440,22 +1440,20 @@ void mt7915_get_et_strings(struct ieee80211_hw *hw,
@@ -599,7 +599,7 @@
  
  static void
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 64d2710..91a1031 100644
+index 9126e62f..34323577 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -6,6 +6,7 @@
@@ -611,10 +611,10 @@
  #define fw_name(_dev, name, ...)	({			\
  	char *_fw;						\
 diff --git a/usb.c b/usb.c
-index dc690d1..058f2d1 100644
+index 58ff0682..0ca3b069 100644
 --- a/usb.c
 +++ b/usb.c
-@@ -319,27 +319,29 @@ mt76u_set_endpoints(struct usb_interface *intf,
+@@ -318,27 +318,29 @@ mt76u_set_endpoints(struct usb_interface *intf,
  
  static int
  mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
@@ -649,7 +649,7 @@
  		urb->num_sgs = i;
  	}
  
-@@ -352,16 +354,15 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
+@@ -351,16 +353,15 @@ mt76u_fill_rx_sg(struct mt76_dev *dev, struct mt76_queue *q, struct urb *urb,
  
  static int
  mt76u_refill_rx(struct mt76_dev *dev, struct mt76_queue *q,
@@ -669,7 +669,7 @@
  
  	return urb->transfer_buffer ? 0 : -ENOMEM;
  }
-@@ -399,7 +400,7 @@ mt76u_rx_urb_alloc(struct mt76_dev *dev, struct mt76_queue *q,
+@@ -398,7 +399,7 @@ mt76u_rx_urb_alloc(struct mt76_dev *dev, struct mt76_queue *q,
  	if (err)
  		return err;
  
@@ -678,7 +678,7 @@
  }
  
  static void mt76u_urb_free(struct urb *urb)
-@@ -407,10 +408,10 @@ static void mt76u_urb_free(struct urb *urb)
+@@ -406,10 +407,10 @@ static void mt76u_urb_free(struct urb *urb)
  	int i;
  
  	for (i = 0; i < urb->num_sgs; i++)
@@ -691,7 +691,7 @@
  
  	usb_free_urb(urb);
  }
-@@ -546,8 +547,6 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb,
+@@ -545,8 +546,6 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb,
  		len -= data_len;
  		nsgs++;
  	}
@@ -700,7 +700,7 @@
  	dev->drv->rx_skb(dev, MT_RXQ_MAIN, skb, NULL);
  
  	return nsgs;
-@@ -613,7 +612,7 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
+@@ -612,7 +611,7 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
  
  		count = mt76u_process_rx_entry(dev, urb, q->buf_size);
  		if (count > 0) {
@@ -709,7 +709,7 @@
  			if (err < 0)
  				break;
  		}
-@@ -664,10 +663,6 @@ mt76u_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid)
+@@ -663,10 +662,6 @@ mt76u_alloc_rx_queue(struct mt76_dev *dev, enum mt76_rxq_id qid)
  	struct mt76_queue *q = &dev->q_rx[qid];
  	int i, err;
  
@@ -720,7 +720,7 @@
  	spin_lock_init(&q->lock);
  	q->entry = devm_kcalloc(dev->dev,
  				MT_NUM_RX_ENTRIES, sizeof(*q->entry),
-@@ -696,6 +691,7 @@ EXPORT_SYMBOL_GPL(mt76u_alloc_mcu_queue);
+@@ -695,6 +690,7 @@ EXPORT_SYMBOL_GPL(mt76u_alloc_mcu_queue);
  static void
  mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
  {
@@ -728,7 +728,7 @@
  	int i;
  
  	for (i = 0; i < q->ndesc; i++) {
-@@ -705,8 +701,13 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
+@@ -704,8 +700,13 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
  		mt76u_urb_free(q->entry[i].urb);
  		q->entry[i].urb = NULL;
  	}
@@ -745,7 +745,7 @@
  
  static void mt76u_free_rx(struct mt76_dev *dev)
 diff --git a/wed.c b/wed.c
-index f89e453..f7a3f1b 100644
+index f89e4537..f7a3f1b3 100644
 --- a/wed.c
 +++ b/wed.c
 @@ -9,8 +9,12 @@
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1000-wifi-mt76-mt7915-add-mtk-internal-debug-tools-for-mt.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1000-wifi-mt76-mt7915-add-mtk-internal-debug-tools-for-mt.patch
similarity index 99%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1000-wifi-mt76-mt7915-add-mtk-internal-debug-tools-for-mt.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1000-wifi-mt76-mt7915-add-mtk-internal-debug-tools-for-mt.patch
index 646d0bf..faacd82 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1000-wifi-mt76-mt7915-add-mtk-internal-debug-tools-for-mt.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1000-wifi-mt76-mt7915-add-mtk-internal-debug-tools-for-mt.patch
@@ -1,7 +1,8 @@
-From 57ca0074490c096cf61f5857ceb233f9a763cf82 Mon Sep 17 00:00:00 2001
+From 7bf558421b15b867069d388e519e1a83edc190ed Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Wed, 22 Jun 2022 10:39:47 +0800
-Subject: [PATCH] wifi: mt76: mt7915: add mtk internal debug tools for mt76
+Subject: [PATCH 1000/1052] wifi: mt76: mt7915: add mtk internal debug tools
+ for mt76
 
 ---
  mt76_connac_mcu.h     |    6 +
@@ -23,7 +24,7 @@
  create mode 100644 mt7915/mtk_mcu.c
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 79d248d..78ddc6e 100644
+index abc57f18..01d6598a 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1197,6 +1197,7 @@ enum {
@@ -47,7 +48,7 @@
  	MCU_EXT_CMD_CAL_CACHE = 0x67,
  	MCU_EXT_CMD_RED_ENABLE = 0x68,
 diff --git a/mt7915/Makefile b/mt7915/Makefile
-index c4dca9c..fd71141 100644
+index c4dca9c1..fd711416 100644
 --- a/mt7915/Makefile
 +++ b/mt7915/Makefile
 @@ -4,7 +4,7 @@ EXTRA_CFLAGS += -DCONFIG_MT76_LEDS
@@ -60,7 +61,7 @@
  mt7915e-$(CONFIG_NL80211_TESTMODE) += testmode.o
  mt7915e-$(CONFIG_MT798X_WMAC) += soc.o
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 894e2cd..2661386 100644
+index 894e2cd7..26613869 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -8,6 +8,9 @@
@@ -232,7 +233,7 @@
  
  	if (dev->relay_fwlog)
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 1c5ab41..8268c19 100644
+index 1c5ab41f..8268c19a 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -282,6 +282,10 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
@@ -271,7 +272,7 @@
  }
  
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 417002f..4d8cb1c 100644
+index a3facc9a..fc9a464a 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -73,7 +73,11 @@ int mt7915_run(struct ieee80211_hw *hw)
@@ -295,7 +296,7 @@
  	mt7915_mac_wtbl_update(dev, idx,
  			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 2326523..5493efa 100644
+index 34323577..ff7f81b0 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -205,6 +205,11 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
@@ -379,7 +380,7 @@
 +}
 +#endif
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index fa0847d..9ae0f07 100644
+index fa0847d5..9ae0f07a 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -347,6 +347,10 @@ enum {
@@ -394,7 +395,7 @@
  	MCU_WA_PARAM_RED_SETTING = 0x40,
  };
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 74cd8ca..58c0bf9 100644
+index 74cd8caf..58c0bf99 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -9,6 +9,7 @@
@@ -481,7 +482,7 @@
  #endif
 diff --git a/mt7915/mt7915_debug.h b/mt7915/mt7915_debug.h
 new file mode 100644
-index 0000000..1ec8de9
+index 00000000..1ec8de99
 --- /dev/null
 +++ b/mt7915/mt7915_debug.h
 @@ -0,0 +1,1442 @@
@@ -1929,7 +1930,7 @@
 +#endif
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
 new file mode 100644
-index 0000000..665d8bd
+index 00000000..665d8bd4
 --- /dev/null
 +++ b/mt7915/mtk_debugfs.c
 @@ -0,0 +1,3750 @@
@@ -4859,7 +4860,7 @@
 +	struct mt76_dev *mdev = NULL;
 +	int i;
 +
-+	seq_printf(s, "Version: 2.2.24.5\n");
++	seq_printf(s, "Version: 2.2.24.7\n");
 +
 +	if (!test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state))
 +		return 0;
@@ -5685,7 +5686,7 @@
 +#endif
 diff --git a/mt7915/mtk_mcu.c b/mt7915/mtk_mcu.c
 new file mode 100644
-index 0000000..143dae2
+index 00000000..143dae26
 --- /dev/null
 +++ b/mt7915/mtk_mcu.c
 @@ -0,0 +1,51 @@
@@ -5741,7 +5742,7 @@
 +				 sizeof(req), true);
 +}
 diff --git a/mt7915/soc.c b/mt7915/soc.c
-index bb3468a..b941a49 100644
+index bb3468a9..b941a49d 100644
 --- a/mt7915/soc.c
 +++ b/mt7915/soc.c
 @@ -360,6 +360,13 @@ static int mt798x_wmac_sku_setup(struct mt7915_dev *dev, u32 *adie_type)
@@ -5759,7 +5760,7 @@
  	mt76_wmac_spi_unlock(dev);
  
 diff --git a/tools/fwlog.c b/tools/fwlog.c
-index e5d4a10..3d51d9e 100644
+index e5d4a105..3d51d9ec 100644
 --- a/tools/fwlog.c
 +++ b/tools/fwlog.c
 @@ -26,7 +26,7 @@ static const char *debugfs_path(const char *phyname, const char *file)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1001-wifi-mt76-mt7915-csi-implement-csi-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1001-wifi-mt76-mt7915-csi-implement-csi-support.patch
similarity index 97%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1001-wifi-mt76-mt7915-csi-implement-csi-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1001-wifi-mt76-mt7915-csi-implement-csi-support.patch
index 115bb84..1e84172 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1001-wifi-mt76-mt7915-csi-implement-csi-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1001-wifi-mt76-mt7915-csi-implement-csi-support.patch
@@ -1,7 +1,7 @@
-From c5e9e8836065c1651ab7b84a0d30953c45c7a35d Mon Sep 17 00:00:00 2001
+From 594116fbcff4d30156c7207244633ad3c1bf9ec1 Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Mon, 6 Jun 2022 20:13:02 +0800
-Subject: [PATCH] wifi: mt76: mt7915: csi: implement csi support
+Subject: [PATCH 1001/1052] wifi: mt76: mt7915: csi: implement csi support
 
 ---
  mt76_connac_mcu.h |   2 +
@@ -19,10 +19,10 @@
  create mode 100644 mt7915/vendor.h
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index a8690cd..cda7559 100644
+index 01d6598a..ad63596d 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1029,6 +1029,7 @@ enum {
+@@ -1030,6 +1030,7 @@ enum {
  	MCU_EXT_EVENT_WA_TX_STAT = 0x74,
  	MCU_EXT_EVENT_BCC_NOTIFY = 0x75,
  	MCU_EXT_EVENT_MURU_CTRL = 0x9f,
@@ -30,7 +30,7 @@
  };
  
  /* unified event table */
-@@ -1243,6 +1244,7 @@ enum {
+@@ -1245,6 +1246,7 @@ enum {
  	MCU_EXT_CMD_DPD_PRE_CAL_INFO = 0xac,
  	MCU_EXT_CMD_PHY_STAT_INFO = 0xad,
  	MCU_EXT_CMD_SET_QOS_MAP = 0xb4,
@@ -39,7 +39,7 @@
  
  enum {
 diff --git a/mt7915/Makefile b/mt7915/Makefile
-index fd71141..65129b4 100644
+index fd711416..65129b4f 100644
 --- a/mt7915/Makefile
 +++ b/mt7915/Makefile
 @@ -1,10 +1,10 @@
@@ -56,7 +56,7 @@
  mt7915e-$(CONFIG_NL80211_TESTMODE) += testmode.o
  mt7915e-$(CONFIG_MT798X_WMAC) += soc.o
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 2661386..909df24 100644
+index 26613869..909df246 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -1241,6 +1241,51 @@ mt7915_rf_regval_set(void *data, u64 val)
@@ -122,10 +122,10 @@
  	if (!ext_phy)
  		dev->debugfs_dir = dir;
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 19a68c5..1200405 100644
+index 84c69a88..ac15bc53 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -697,6 +697,14 @@ mt7915_register_ext_phy(struct mt7915_dev *dev, struct mt7915_phy *phy)
+@@ -668,6 +668,14 @@ mt7915_register_ext_phy(struct mt7915_dev *dev, struct mt7915_phy *phy)
  	/* init wiphy according to mphy and phy */
  	mt7915_init_wiphy(phy);
  
@@ -140,7 +140,7 @@
  	ret = mt76_register_phy(mphy, true, mt76_rates,
  				ARRAY_SIZE(mt76_rates));
  	if (ret)
-@@ -1178,6 +1186,28 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy)
+@@ -1146,6 +1154,28 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy)
  	}
  }
  
@@ -169,7 +169,7 @@
  static void mt7915_unregister_ext_phy(struct mt7915_dev *dev)
  {
  	struct mt7915_phy *phy = mt7915_ext_phy(dev);
-@@ -1186,6 +1216,10 @@ static void mt7915_unregister_ext_phy(struct mt7915_dev *dev)
+@@ -1154,6 +1184,10 @@ static void mt7915_unregister_ext_phy(struct mt7915_dev *dev)
  	if (!phy)
  		return;
  
@@ -180,7 +180,7 @@
  	mt7915_unregister_thermal(phy);
  	mt76_unregister_phy(mphy);
  	ieee80211_free_hw(mphy->hw);
-@@ -1198,6 +1232,10 @@ static void mt7915_stop_hardware(struct mt7915_dev *dev)
+@@ -1166,6 +1200,10 @@ static void mt7915_stop_hardware(struct mt7915_dev *dev)
  	mt7915_dma_cleanup(dev);
  	tasklet_disable(&dev->mt76.irq_tasklet);
  
@@ -191,7 +191,7 @@
  	if (is_mt798x(&dev->mt76))
  		mt7986_wmac_disable(dev);
  }
-@@ -1242,6 +1280,14 @@ int mt7915_register_device(struct mt7915_dev *dev)
+@@ -1210,6 +1248,14 @@ int mt7915_register_device(struct mt7915_dev *dev)
  	dev->mt76.test_ops = &mt7915_testmode_ops;
  #endif
  
@@ -207,7 +207,7 @@
  				   ARRAY_SIZE(mt76_rates));
  	if (ret)
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 5523031..f3c3b7e 100644
+index fc9a464a..12bb0b39 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -810,6 +810,19 @@ void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -231,7 +231,7 @@
  	mt7915_mcu_add_sta(dev, vif, sta, false);
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 37b1505..33dab71 100644
+index ff7f81b0..44765b1f 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -40,6 +40,10 @@ static bool sr_scene_detect = true;
@@ -459,7 +459,7 @@
  int mt7915_dbg_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3, bool wait_resp)
  {
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 9ae0f07..f32d525 100644
+index 9ae0f07a..f32d5256 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -604,4 +604,78 @@ mt7915_get_power_bound(struct mt7915_phy *phy, s8 txpower)
@@ -542,10 +542,10 @@
 +
  #endif
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index d2224dc..4696171 100644
+index 58c0bf99..1316f93d 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -197,6 +197,57 @@ struct mt7915_hif {
+@@ -195,6 +195,57 @@ struct mt7915_hif {
  	int irq;
  };
  
@@ -603,7 +603,7 @@
  struct mt7915_phy {
  	struct mt76_phy *mt76;
  	struct mt7915_dev *dev;
-@@ -245,6 +296,25 @@ struct mt7915_phy {
+@@ -243,6 +294,25 @@ struct mt7915_phy {
  		u8 spe_idx;
  	} test;
  #endif
@@ -629,7 +629,7 @@
  };
  
  #ifdef MTK_DEBUG
-@@ -649,6 +719,14 @@ void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+@@ -646,6 +716,14 @@ void mt7915_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
  int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
  			 bool pci, int *irq);
  
@@ -646,7 +646,7 @@
  int mt7915_dbg_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3, bool wait_resp);
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
 new file mode 100644
-index 0000000..0476202
+index 00000000..92496513
 --- /dev/null
 +++ b/mt7915/vendor.c
 @@ -0,0 +1,606 @@
@@ -1258,7 +1258,7 @@
 +}
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
 new file mode 100644
-index 0000000..d2b90aa
+index 00000000..d2b90aa0
 --- /dev/null
 +++ b/mt7915/vendor.h
 @@ -0,0 +1,75 @@
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1002-wifi-mt76-mt7915-air-monitor-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1002-wifi-mt76-mt7915-air-monitor-support.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1002-wifi-mt76-mt7915-air-monitor-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1002-wifi-mt76-mt7915-air-monitor-support.patch
index 1bbc85f..06612ed 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1002-wifi-mt76-mt7915-air-monitor-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1002-wifi-mt76-mt7915-air-monitor-support.patch
@@ -1,7 +1,7 @@
-From 703dc34c3f03017062f03a74add408ece14914a9 Mon Sep 17 00:00:00 2001
+From 3ae462a794ae2a8b613c23aa6179cf5c7b2f7b3c Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Tue, 11 Jan 2022 12:03:23 +0800
-Subject: [PATCH] wifi: mt76: mt7915: air monitor support
+Subject: [PATCH 1002/1052] wifi: mt76: mt7915: air monitor support
 
 ---
  mt76_connac_mcu.h |   2 +
@@ -13,10 +13,10 @@
  6 files changed, 441 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index cda7559..3aa4e59 100644
+index ad63596d..cd6db774 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1243,6 +1243,8 @@ enum {
+@@ -1245,6 +1245,8 @@ enum {
  	MCU_EXT_CMD_GROUP_PRE_CAL_INFO = 0xab,
  	MCU_EXT_CMD_DPD_PRE_CAL_INFO = 0xac,
  	MCU_EXT_CMD_PHY_STAT_INFO = 0xad,
@@ -26,7 +26,7 @@
  	MCU_EXT_CMD_CSI_CTRL = 0xc2,
  };
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index d99864f..e38905a 100644
+index 8268c19a..778f04f7 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -531,6 +531,10 @@ mt7915_mac_fill_rx(struct mt7915_dev *dev, struct sk_buff *skb,
@@ -41,7 +41,7 @@
  		status->flag |= RX_FLAG_8023;
  		mt7915_wed_check_ppe(dev, &dev->mt76.q_rx[q], msta, skb,
 diff --git a/mt7915/main.c b/mt7915/main.c
-index f3c3b7e..707afcc 100644
+index 12bb0b39..aca3e9c0 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -800,6 +800,9 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -55,10 +55,10 @@
  }
  
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 4696171..1acf938 100644
+index 1316f93d..bb39a53a 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -234,6 +234,7 @@ struct csi_data {
+@@ -232,6 +232,7 @@ struct csi_data {
  
  	struct list_head node;
  };
@@ -66,7 +66,7 @@
  struct csi_mac_filter {
  	struct list_head node;
  
-@@ -246,6 +247,33 @@ struct csi_mac_filter {
+@@ -244,6 +245,33 @@ struct csi_mac_filter {
  #define SHOW_CSI_MAC 2
  
  #define MAX_CSI_MAC_NUM 10
@@ -100,7 +100,7 @@
  #endif
  
  struct mt7915_phy {
-@@ -314,6 +342,8 @@ struct mt7915_phy {
+@@ -312,6 +340,8 @@ struct mt7915_phy {
  		u32 interval;
  		u32 last_record;
  	} csi;
@@ -109,7 +109,7 @@
  #endif
  };
  
-@@ -725,6 +755,9 @@ int mt7915_mcu_set_csi(struct mt7915_phy *phy, u8 mode,
+@@ -722,6 +752,9 @@ int mt7915_mcu_set_csi(struct mt7915_phy *phy, u8 mode,
  		       u8 cfg, u8 v1, u32 v2, u8 *mac_addr, u32 sta_interval);
  struct csi_mac_filter *mt7915_csi_mac_filter_find(struct mt7915_phy *phy, u8 *addr);
  void mt7915_csi_mac_filter_clear(struct mt7915_phy *phy);
@@ -120,7 +120,7 @@
  
  #ifdef MTK_DEBUG
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 0476202..4c11ed1 100644
+index 92496513..fb32cd6d 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
 @@ -584,6 +584,355 @@ out:
@@ -499,7 +499,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index d2b90aa..429b25b 100644
+index d2b90aa0..429b25b7 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -5,6 +5,7 @@
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1003-wifi-mt76-mt7915-add-support-for-muru_onoff-via.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1003-wifi-mt76-mt7915-add-support-for-muru_onoff-via.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1003-wifi-mt76-mt7915-add-support-for-muru_onoff-via.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1003-wifi-mt76-mt7915-add-support-for-muru_onoff-via.patch
index 490e884..7bf27a4 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1003-wifi-mt76-mt7915-add-support-for-muru_onoff-via.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1003-wifi-mt76-mt7915-add-support-for-muru_onoff-via.patch
@@ -1,7 +1,7 @@
-From 76e8a5bbc80cf7612256c7783555bba11dbf5b8b Mon Sep 17 00:00:00 2001
+From 6ec4565becc5364a689b346496c7caaef98f83e9 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Tue, 4 Apr 2023 02:23:57 +0800
-Subject: [PATCH 1003/1051] wifi: mt76: mt7915: add support for muru_onoff via
+Subject: [PATCH 1003/1052] wifi: mt76: mt7915: add support for muru_onoff via
 
 ---
  mt7915/init.c        |  1 +
@@ -12,10 +12,10 @@
  5 files changed, 50 insertions(+), 2 deletions(-)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 3f06360..6fa3a51 100644
+index ac15bc53..18c6ef7e 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -363,6 +363,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+@@ -364,6 +364,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
  		IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US;
  
  	phy->slottime = 9;
@@ -24,7 +24,7 @@
  	hw->sta_data_size = sizeof(struct mt7915_sta);
  	hw->vif_data_size = sizeof(struct mt7915_vif);
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 3f35ba3..5aaa3f0 100644
+index 44765b1f..6867635f 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -965,6 +965,7 @@ mt7915_mcu_sta_muru_tlv(struct mt7915_dev *dev, struct sk_buff *skb,
@@ -57,7 +57,7 @@
  		muru->mimo_dl.vht_mu_bfee =
  			!!(sta->deflink.vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index f32d525..f44146e 100644
+index f32d5256..f44146ed 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -678,4 +678,10 @@ enum CSI_CHAIN_TYPE {
@@ -72,10 +72,10 @@
 +
  #endif
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 57a9da3..95722cb 100644
+index bb39a53a..14107de3 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -291,6 +291,8 @@ struct mt7915_phy {
+@@ -302,6 +302,8 @@ struct mt7915_phy {
  	u32 rx_ampdu_ts;
  	u32 ampdu_ref;
  
@@ -85,7 +85,7 @@
  	struct mt76_channel_state state_ts;
  
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 62d3a99..2f55a84 100644
+index 665d8bd4..0beb3644 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -2554,6 +2554,38 @@ static int mt7915_token_txd_read(struct seq_file *s, void *data)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1004-wifi-mt76-mt7915-certification-patches.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1004-wifi-mt76-mt7915-certification-patches.patch
similarity index 97%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1004-wifi-mt76-mt7915-certification-patches.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1004-wifi-mt76-mt7915-certification-patches.patch
index b9fac6d..7024d1f 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1004-wifi-mt76-mt7915-certification-patches.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1004-wifi-mt76-mt7915-certification-patches.patch
@@ -1,7 +1,7 @@
-From 9196ca94b27491c6841a3a1a46afb8557f82e62d Mon Sep 17 00:00:00 2001
+From 230a5ba21216bb292f2fb1b0cf2236e2e14de2ca Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Mon, 6 Jun 2022 20:15:51 +0800
-Subject: [PATCH 1004/1051] wifi: mt76: mt7915: certification patches
+Subject: [PATCH 1004/1052] wifi: mt76: mt7915: certification patches
 
 ---
  mt76_connac_mcu.h    |   1 +
@@ -16,10 +16,10 @@
  9 files changed, 955 insertions(+), 5 deletions(-)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 3aa4e59..d62b7df 100644
+index cd6db774..bd28cc50 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1246,6 +1246,7 @@ enum {
+@@ -1248,6 +1248,7 @@ enum {
  	/* for vendor csi and air monitor */
  	MCU_EXT_CMD_SMESH_CTRL = 0xae,
  	MCU_EXT_CMD_SET_QOS_MAP = 0xb4,
@@ -28,7 +28,7 @@
  };
  
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 778f04f..2fd1d1f 100644
+index 778f04f7..2fd1d1fb 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -8,6 +8,7 @@
@@ -76,7 +76,7 @@
  			       IEEE80211_RC_NSS_CHANGED |
  			       IEEE80211_RC_BW_CHANGED))
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 9fd65f0..5c483b3 100644
+index aca3e9c0..09e1a83b 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -771,6 +771,9 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
@@ -107,7 +107,7 @@
  
  void mt7915_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 5aaa3f0..aaac73a 100644
+index 6867635f..c819a3be 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -4402,6 +4402,472 @@ mt7915_mcu_report_csi(struct mt7915_dev *dev, struct sk_buff *skb)
@@ -584,7 +584,7 @@
  
  #ifdef MTK_DEBUG
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index f44146e..eef2fc0 100644
+index f44146ed..eef2fc00 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -486,10 +486,14 @@ enum {
@@ -818,10 +818,10 @@
  
  #endif
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 95722cb..ea309bf 100644
+index 14107de3..cf49ac86 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -735,6 +735,19 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
+@@ -749,6 +749,19 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
  			 bool pci, int *irq);
  
  #ifdef CONFIG_MTK_VENDOR
@@ -842,7 +842,7 @@
  int mt7915_mcu_set_csi(struct mt7915_phy *phy, u8 mode,
  		       u8 cfg, u8 v1, u32 v2, u8 *mac_addr, u32 sta_interval);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 2f55a84..84f8fae 100644
+index 0beb3644..54daa736 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -2560,7 +2560,8 @@ static int mt7915_muru_onoff_get(void *data, u64 *val)
@@ -867,11 +867,11 @@
  	}
  
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index c964b14..7a71894 100644
+index fb32cd6d..e4317af3 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -23,6 +23,29 @@ csi_ctrl_policy[NUM_MTK_VENDOR_ATTRS_CSI_CTRL] = {
- 	[MTK_VENDOR_ATTR_CSI_CTRL_DATA] = { .type = NLA_NESTED },
+@@ -24,6 +24,29 @@ csi_ctrl_policy[NUM_MTK_VENDOR_ATTRS_CSI_CTRL] = {
+ 	[MTK_VENDOR_ATTR_CSI_CTRL_DUMP_MAC_FILTER] = { .type = NLA_NESTED },
  };
  
 +static const struct nla_policy
@@ -900,7 +900,7 @@
  struct csi_null_tone {
  	u8 start;
  	u8 end;
-@@ -797,6 +820,149 @@ mt7915_vendor_amnt_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
+@@ -933,6 +956,149 @@ mt7915_vendor_amnt_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
  	return len + 1;
  }
  
@@ -1050,7 +1050,7 @@
  static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  	{
  		.info = {
-@@ -821,6 +987,28 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -957,6 +1123,28 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.dumpit = mt7915_vendor_amnt_ctrl_dump,
  		.policy = amnt_ctrl_policy,
  		.maxattr = MTK_VENDOR_ATTR_AMNT_CTRL_MAX,
@@ -1080,7 +1080,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 1863eee..1a18cae 100644
+index 429b25b7..1a0139d7 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -7,6 +7,48 @@
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1005-wifi-mt76-mt7915-add-mt76-vendor-muru-onoff-command.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1005-wifi-mt76-mt7915-add-mt76-vendor-muru-onoff-command.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1005-wifi-mt76-mt7915-add-mt76-vendor-muru-onoff-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1005-wifi-mt76-mt7915-add-mt76-vendor-muru-onoff-command.patch
index 9eb1db4..d110348 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1005-wifi-mt76-mt7915-add-mt76-vendor-muru-onoff-command.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1005-wifi-mt76-mt7915-add-mt76-vendor-muru-onoff-command.patch
@@ -1,7 +1,7 @@
-From 78cd3b046f6f037e2b78557860e8c14796c40a00 Mon Sep 17 00:00:00 2001
+From d6ae847c0cea20f781970198a2aed4dc7e4daffa Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Tue, 4 Apr 2023 02:27:44 +0800
-Subject: [PATCH 1005/1051] wifi: mt76: mt7915: add mt76 vendor muru onoff
+Subject: [PATCH 1005/1052] wifi: mt76: mt7915: add mt76 vendor muru onoff
  command
 
 ---
@@ -12,7 +12,7 @@
  4 files changed, 63 insertions(+)
 
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index aaac73a..8bb7185 100644
+index c819a3be..cd5363c6 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -4422,6 +4422,13 @@ void mt7915_set_wireless_vif(void *data, u8 *mac, struct ieee80211_vif *vif)
@@ -30,7 +30,7 @@
  }
  
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index eef2fc0..8650053 100644
+index eef2fc00..86500536 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -493,6 +493,7 @@ enum {
@@ -42,10 +42,10 @@
  };
  
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 7a71894..a8b1fa8 100644
+index e4317af3..cf09b513 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -35,6 +35,11 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
+@@ -36,6 +36,11 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
  	[MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT] = {.type = NLA_U8 },
  };
  
@@ -57,7 +57,7 @@
  static const struct nla_policy
  rfeature_ctrl_policy[NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL] = {
  	[MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_GI] = {.type = NLA_U8 },
-@@ -963,6 +968,33 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
+@@ -1099,6 +1104,33 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
  	return 0;
  }
  
@@ -91,7 +91,7 @@
  static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  	{
  		.info = {
-@@ -1009,6 +1041,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1145,6 +1177,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.doit = mt7915_vendor_wireless_ctrl,
  		.policy = wireless_ctrl_policy,
  		.maxattr = MTK_VENDOR_ATTR_WIRELESS_CTRL_MAX,
@@ -110,7 +110,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 1a18cae..a4a9180 100644
+index 1a0139d7..9cb67551 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -9,6 +9,7 @@ enum mtk_nl80211_vendor_subcmds {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1006-wifi-mt76-mt7915-drop-undefined-action-frame.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1006-wifi-mt76-mt7915-drop-undefined-action-frame.patch
similarity index 87%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1006-wifi-mt76-mt7915-drop-undefined-action-frame.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1006-wifi-mt76-mt7915-drop-undefined-action-frame.patch
index 5a66be9..0182c4f 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1006-wifi-mt76-mt7915-drop-undefined-action-frame.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1006-wifi-mt76-mt7915-drop-undefined-action-frame.patch
@@ -1,14 +1,14 @@
-From 2c33bfa0c261aaf9263bfef4b811a97bc72e20d5 Mon Sep 17 00:00:00 2001
+From d48d6a0643e5be590744db4173e14c87f4945390 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Thu, 14 Apr 2022 15:18:02 +0800
-Subject: [PATCH 1006/1051] wifi: mt76: mt7915: drop undefined action frame
+Subject: [PATCH 1006/1052] wifi: mt76: mt7915: drop undefined action frame
 
 ---
  mt7915/mac.c | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 2fd1d1f..4177d6a 100644
+index 2fd1d1fb..4177d6a3 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -744,6 +744,8 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1007-wifi-mt76-testmode-rework-testmode-init-registers.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1007-wifi-mt76-testmode-rework-testmode-init-registers.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1007-wifi-mt76-testmode-rework-testmode-init-registers.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1007-wifi-mt76-testmode-rework-testmode-init-registers.patch
index fa485ce..0f0e9d5 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1007-wifi-mt76-testmode-rework-testmode-init-registers.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1007-wifi-mt76-testmode-rework-testmode-init-registers.patch
@@ -1,7 +1,7 @@
-From 2a6f2256321718cb48b28b0d1a6113dc195de03a Mon Sep 17 00:00:00 2001
+From bbbac8090c06fd110f3770d99e7993017101cfd0 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 6 Jun 2022 19:46:26 +0800
-Subject: [PATCH 1007/1051] wifi: mt76: testmode: rework testmode init
+Subject: [PATCH 1007/1052] wifi: mt76: testmode: rework testmode init
  registers
 
 ---
@@ -18,10 +18,10 @@
  10 files changed, 164 insertions(+), 35 deletions(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index b30a74e..3f5c2ed 100644
+index 4d50bfae..9ebb2746 100644
 --- a/mac80211.c
 +++ b/mac80211.c
-@@ -804,7 +804,8 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)
+@@ -805,7 +805,8 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)
  	}
  
  #ifdef CONFIG_NL80211_TESTMODE
@@ -32,7 +32,7 @@
  		if (status->flag & RX_FLAG_FAILED_FCS_CRC)
  			phy->test.rx_stats.fcs_error[q]++;
 diff --git a/mt76.h b/mt76.h
-index a07c7df..fe5b136 100644
+index 063fc364..329e4d7a 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -709,6 +709,8 @@ struct mt76_testmode_ops {
@@ -62,10 +62,10 @@
  };
  
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index d62b7df..22d477f 100644
+index bd28cc50..f5edeef6 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1239,6 +1239,7 @@ enum {
+@@ -1241,6 +1241,7 @@ enum {
  	MCU_EXT_CMD_OFFCH_SCAN_CTRL = 0x9a,
  	MCU_EXT_CMD_SET_RDD_TH = 0x9d,
  	MCU_EXT_CMD_MURU_CTRL = 0x9f,
@@ -74,7 +74,7 @@
  	MCU_EXT_CMD_GROUP_PRE_CAL_INFO = 0xab,
  	MCU_EXT_CMD_DPD_PRE_CAL_INFO = 0xac,
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 8650053..7653b5e 100644
+index 86500536..7653b5e2 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -9,6 +9,7 @@
@@ -86,7 +86,7 @@
  	MCU_ATE_CLEAN_TXQUEUE = 0x1c,
  };
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 6004d64..694fc1b 100644
+index d6ecd698..02b4714c 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -120,6 +120,7 @@ static const u32 mt7986_reg[] = {
@@ -106,7 +106,7 @@
  	[TMAC_ODTR]		= 0x0cc,
  	[TMAC_ATCR]		= 0x00c,
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index 3452a7e..8bb6a9f 100644
+index 3452a7e9..8bb6a9f2 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -48,6 +48,7 @@ enum reg_rev {
@@ -154,7 +154,7 @@
  #define MT_AGG_ACR0(_band)		MT_WF_AGG(_band, __OFFS(AGG_ACR0))
  #define MT_AGG_ACR_CFEND_RATE		GENMASK(13, 0)
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index 0d76ae3..4693919 100644
+index 0d76ae31..46939191 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -30,7 +30,7 @@ struct reg_band {
@@ -379,7 +379,7 @@
  
  const struct mt76_testmode_ops mt7915_testmode_ops = {
 diff --git a/mt7915/testmode.h b/mt7915/testmode.h
-index 5573ac3..a1c54c8 100644
+index 5573ac30..a1c54c89 100644
 --- a/mt7915/testmode.h
 +++ b/mt7915/testmode.h
 @@ -33,6 +33,12 @@ struct mt7915_tm_clean_txq {
@@ -430,7 +430,7 @@
 +
  #endif
 diff --git a/testmode.c b/testmode.c
-index ca4fecc..9e05b86 100644
+index ca4feccf..9e05b862 100644
 --- a/testmode.c
 +++ b/testmode.c
 @@ -448,8 +448,7 @@ int mt76_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -454,7 +454,7 @@
  		return -EMSGSIZE;
  
 diff --git a/testmode.h b/testmode.h
-index 5e2792d..8961326 100644
+index 5e2792d8..89613266 100644
 --- a/testmode.h
 +++ b/testmode.h
 @@ -101,6 +101,8 @@ enum mt76_testmode_attr {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1008-wifi-mt76-testmode-additional-supports.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1008-wifi-mt76-testmode-additional-supports.patch
similarity index 98%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1008-wifi-mt76-testmode-additional-supports.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1008-wifi-mt76-testmode-additional-supports.patch
index 4023904..470e6e4 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1008-wifi-mt76-testmode-additional-supports.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1008-wifi-mt76-testmode-additional-supports.patch
@@ -1,7 +1,7 @@
-From aba0454fa24cdc1f0650375d4e3264778c3756ab Mon Sep 17 00:00:00 2001
+From d2bc22b6da2b5bbc7d4c441a1a6b8c55c3fc7462 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Thu, 21 Apr 2022 15:43:19 +0800
-Subject: [PATCH 1008/1051] wifi: mt76: testmode: additional supports
+Subject: [PATCH 1008/1052] wifi: mt76: testmode: additional supports
 
 Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -29,7 +29,7 @@
  20 files changed, 2073 insertions(+), 169 deletions(-)
 
 diff --git a/dma.c b/dma.c
-index ccdd564..bc8afcf 100644
+index ccdd5646..bc8afcff 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -614,8 +614,7 @@ free:
@@ -43,7 +43,7 @@
  #endif
  
 diff --git a/mac80211.c b/mac80211.c
-index 3f5c2ed..305cae7 100644
+index 9ebb2746..d6b70374 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -55,6 +55,13 @@ static const struct ieee80211_channel mt76_channels_5ghz[] = {
@@ -73,7 +73,7 @@
  
  static const struct ieee80211_channel mt76_channels_6ghz[] = {
 diff --git a/mt76.h b/mt76.h
-index fe5b136..a7d424f 100644
+index 329e4d7a..62205051 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -707,6 +707,21 @@ struct mt76_testmode_ops {
@@ -246,7 +246,7 @@
  static inline void mt76_testmode_reset(struct mt76_phy *phy, bool disable)
  {
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index a8f097d..44cd646 100644
+index 4e84f8d2..2acd7efb 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -407,6 +407,7 @@ void mt76_connac_mcu_sta_basic_tlv(struct mt76_dev *dev, struct sk_buff *skb,
@@ -268,10 +268,10 @@
  		return;
  
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 22d477f..0f408d9 100644
+index f5edeef6..152b4aaa 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1023,6 +1023,7 @@ enum {
+@@ -1024,6 +1024,7 @@ enum {
  	MCU_EXT_EVENT_FW_LOG_2_HOST = 0x13,
  	MCU_EXT_EVENT_THERMAL_PROTECT = 0x22,
  	MCU_EXT_EVENT_ASSERT_DUMP = 0x23,
@@ -279,7 +279,7 @@
  	MCU_EXT_EVENT_RDD_REPORT = 0x3a,
  	MCU_EXT_EVENT_CSA_NOTIFY = 0x4f,
  	MCU_EXT_EVENT_BSS_ACQ_PKT_CNT = 0x52,
-@@ -1246,6 +1247,7 @@ enum {
+@@ -1248,6 +1249,7 @@ enum {
  	MCU_EXT_CMD_PHY_STAT_INFO = 0xad,
  	/* for vendor csi and air monitor */
  	MCU_EXT_CMD_SMESH_CTRL = 0xae,
@@ -288,7 +288,7 @@
  	MCU_EXT_CMD_CERT_CFG = 0xb7,
  	MCU_EXT_CMD_CSI_CTRL = 0xc2,
 diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c
-index bfdbc15..f4876fe 100644
+index bfdbc15a..f4876fe9 100644
 --- a/mt7915/eeprom.c
 +++ b/mt7915/eeprom.c
 @@ -142,7 +142,7 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev)
@@ -301,10 +301,10 @@
  				return ret;
  		}
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 6fa3a51..0994b8a 100644
+index 18c6ef7e..0c58ab7b 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -692,7 +692,7 @@ static void mt7915_init_work(struct work_struct *work)
+@@ -700,7 +700,7 @@ static void mt7915_init_work(struct work_struct *work)
  	struct mt7915_dev *dev = container_of(work, struct mt7915_dev,
  				 init_work);
  
@@ -314,7 +314,7 @@
  	mt7915_txbf_init(dev);
  }
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 4177d6a..b05e163 100644
+index 4177d6a3..b05e1630 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -586,6 +586,7 @@ mt7915_mac_fill_rx_vector(struct mt7915_dev *dev, struct sk_buff *skb)
@@ -404,7 +404,7 @@
  		goto out;
  
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 5c483b3..aebfda8 100644
+index 09e1a83b..2e566710 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -238,7 +238,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
@@ -417,7 +417,7 @@
  		mvif->mt76.wmm_idx += 2;
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 8bb7185..8e3ae93 100644
+index cd5363c6..b5177e30 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -478,6 +478,11 @@ mt7915_mcu_rx_ext_event(struct mt7915_dev *dev, struct sk_buff *skb)
@@ -498,7 +498,7 @@
  
  	return 0;
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 7653b5e..c791c7f 100644
+index 7653b5e2..c791c7fa 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -8,10 +8,15 @@
@@ -556,7 +556,7 @@
  
  enum {
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 694fc1b..222e2cf 100644
+index 02b4714c..730cd338 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -134,6 +134,7 @@ static const u32 mt7915_offs[] = {
@@ -576,10 +576,10 @@
  	[AGG_PCR0]		= 0x040,
  	[AGG_ACR0]		= 0x054,
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index ea309bf..9cc7f3a 100644
+index cf49ac86..bc77a61a 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -306,11 +306,15 @@ struct mt7915_phy {
+@@ -317,11 +317,15 @@ struct mt7915_phy {
  
  		s32 last_freq_offset;
  		u8 last_rcpi[4];
@@ -595,7 +595,7 @@
  	} test;
  #endif
  
-@@ -423,6 +427,14 @@ struct mt7915_dev {
+@@ -438,6 +442,14 @@ struct mt7915_dev {
  	void __iomem *dcm;
  	void __iomem *sku;
  
@@ -610,7 +610,7 @@
  #ifdef MTK_DEBUG
  	u16 wlan_idx;
  	struct {
-@@ -603,8 +615,8 @@ int mt7915_mcu_set_fixed_rate_ctrl(struct mt7915_dev *dev,
+@@ -618,8 +630,8 @@ int mt7915_mcu_set_fixed_rate_ctrl(struct mt7915_dev *dev,
  				   struct ieee80211_vif *vif,
  				   struct ieee80211_sta *sta,
  				   void *data, u32 field);
@@ -621,16 +621,16 @@
  int mt7915_mcu_get_eeprom_free_block(struct mt7915_dev *dev, u8 *block_num);
  int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band, bool enable,
  		       bool hdr_trans);
-@@ -643,6 +655,7 @@ int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 type, u8 ctrl);
+@@ -658,6 +670,7 @@ int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 type, u8 ctrl);
  int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level);
  void mt7915_mcu_rx_event(struct mt7915_dev *dev, struct sk_buff *skb);
  void mt7915_mcu_exit(struct mt7915_dev *dev);
 +int mt7915_tm_txbf_status_read(struct mt7915_dev *dev, struct sk_buff *skb);
  void mt7915_mcu_wmm_pbc_work(struct work_struct *work);
- int mt7915_mcu_set_qos_map(struct mt7915_dev *dev, struct ieee80211_vif *vif);
  
+ static inline u16 mt7915_wtbl_size(struct mt7915_dev *dev)
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index 8bb6a9f..1236da9 100644
+index 8bb6a9f2..1236da91 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -62,6 +62,7 @@ enum offs_rev {
@@ -651,7 +651,7 @@
  							  (_n) * 4))
  #define MT_AGG_PCR0(_band, _n)		MT_WF_AGG(_band, (__OFFS(AGG_PCR0) +	\
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index 4693919..32dc85c 100644
+index 46939191..32dc85cd 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -9,6 +9,10 @@
@@ -2111,7 +2111,7 @@
 +	.set_eeprom = mt7915_tm_set_eeprom,
  };
 diff --git a/mt7915/testmode.h b/mt7915/testmode.h
-index a1c54c8..eb0e043 100644
+index a1c54c89..eb0e0432 100644
 --- a/mt7915/testmode.h
 +++ b/mt7915/testmode.h
 @@ -4,6 +4,8 @@
@@ -2426,7 +2426,7 @@
 +
  #endif
 diff --git a/testmode.c b/testmode.c
-index 9e05b86..7587047 100644
+index 9e05b862..75870478 100644
 --- a/testmode.c
 +++ b/testmode.c
 @@ -8,6 +8,7 @@ const struct nla_policy mt76_tm_policy[NUM_MT76_TM_ATTRS] = {
@@ -2919,7 +2919,7 @@
  
  	if (mt76_testmode_param_present(td, MT76_TM_ATTR_TX_POWER)) {
 diff --git a/testmode.h b/testmode.h
-index 8961326..7a68625 100644
+index 89613266..7a686250 100644
 --- a/testmode.h
 +++ b/testmode.h
 @@ -6,6 +6,8 @@
@@ -3056,7 +3056,7 @@
 +
  #endif
 diff --git a/tools/fields.c b/tools/fields.c
-index e3f6908..406ba77 100644
+index e3f69089..406ba77c 100644
 --- a/tools/fields.c
 +++ b/tools/fields.c
 @@ -10,6 +10,7 @@ static const char * const testmode_state[] = {
@@ -3235,7 +3235,7 @@
  };
  
 diff --git a/tx.c b/tx.c
-index 0fdf7d8..db0d4df 100644
+index 0fdf7d83..db0d4df5 100644
 --- a/tx.c
 +++ b/tx.c
 @@ -259,8 +259,7 @@ void __mt76_tx_complete_skb(struct mt76_dev *dev, u16 wcid_idx, struct sk_buff *
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1009-wifi-mt76-testmode-add-pre-cal-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1009-wifi-mt76-testmode-add-pre-cal-support.patch
similarity index 97%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1009-wifi-mt76-testmode-add-pre-cal-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1009-wifi-mt76-testmode-add-pre-cal-support.patch
index 4a716f1..991c4e4 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1009-wifi-mt76-testmode-add-pre-cal-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1009-wifi-mt76-testmode-add-pre-cal-support.patch
@@ -1,7 +1,7 @@
-From 9d04f2c9a6204160cf75dbd1970dee1db3b75d01 Mon Sep 17 00:00:00 2001
+From fbbb77d3e06f0dd3f4ed27e8bb5ff113fe3c77fc Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 31 Aug 2022 20:06:52 +0800
-Subject: [PATCH] wifi: mt76: testmode: add pre-cal support
+Subject: [PATCH 1009/1052] wifi: mt76: testmode: add pre-cal support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
@@ -18,7 +18,7 @@
  10 files changed, 507 insertions(+), 6 deletions(-)
 
 diff --git a/eeprom.c b/eeprom.c
-index a267397..3625b16 100644
+index a2673978..3625b169 100644
 --- a/eeprom.c
 +++ b/eeprom.c
 @@ -94,8 +94,10 @@ int mt76_get_of_data_from_mtd(struct mt76_dev *dev, void *eep, int offset, int l
@@ -35,7 +35,7 @@
  
  out_put_node:
 diff --git a/mt76.h b/mt76.h
-index a7d424f..20577af 100644
+index 62205051..d8c2a515 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -708,6 +708,7 @@ struct mt76_testmode_ops {
@@ -47,10 +47,10 @@
  
  struct mt76_testmode_entry_data {
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 0972010..b75d340 100644
+index 152b4aaa..cf88b674 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1019,6 +1019,7 @@ enum {
+@@ -1020,6 +1020,7 @@ enum {
  
  /* ext event table */
  enum {
@@ -59,7 +59,7 @@
  	MCU_EXT_EVENT_FW_LOG_2_HOST = 0x13,
  	MCU_EXT_EVENT_THERMAL_PROTECT = 0x22,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 233411c..ad58e3b 100644
+index b5177e30..d4291e24 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -482,6 +482,9 @@ mt7915_mcu_rx_ext_event(struct mt7915_dev *dev, struct sk_buff *skb)
@@ -73,10 +73,10 @@
  	case MCU_EXT_EVENT_BSS_ACQ_PKT_CNT:
  		mt7915_mcu_rx_bss_acq_pkt_cnt(dev, skb);
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 1846e2f..dd2e80b 100644
+index bc77a61a..ca385b66 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -654,6 +654,7 @@ int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level);
+@@ -671,6 +671,7 @@ int mt7915_mcu_fw_dbg_ctrl(struct mt7915_dev *dev, u32 module, u8 level);
  void mt7915_mcu_rx_event(struct mt7915_dev *dev, struct sk_buff *skb);
  void mt7915_mcu_exit(struct mt7915_dev *dev);
  int mt7915_tm_txbf_status_read(struct mt7915_dev *dev, struct sk_buff *skb);
@@ -85,7 +85,7 @@
  
  static inline u16 mt7915_wtbl_size(struct mt7915_dev *dev)
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index 32dc85c..4b34430 100644
+index 32dc85cd..4b344303 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -5,6 +5,7 @@
@@ -560,7 +560,7 @@
 +	.dump_precal = mt7915_tm_dump_precal,
  };
 diff --git a/mt7915/testmode.h b/mt7915/testmode.h
-index eb0e043..7569826 100644
+index eb0e0432..75698261 100644
 --- a/mt7915/testmode.h
 +++ b/mt7915/testmode.h
 @@ -81,6 +81,11 @@ struct tm_tx_cont {
@@ -628,7 +628,7 @@
  	TAM_ARB_OP_MODE_NORMAL = 1,
  	TAM_ARB_OP_MODE_TEST,
 diff --git a/testmode.c b/testmode.c
-index 7587047..132267e 100644
+index 75870478..132267eb 100644
 --- a/testmode.c
 +++ b/testmode.c
 @@ -771,6 +771,18 @@ int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,
@@ -661,7 +661,7 @@
  	    (nla_put_string(msg, MT76_TM_ATTR_MTD_PART, dev->test_mtd.name) ||
  	     nla_put_u32(msg, MT76_TM_ATTR_MTD_OFFSET, dev->test_mtd.offset)))
 diff --git a/testmode.h b/testmode.h
-index 7a68625..e4c1b52 100644
+index 7a686250..e4c1b521 100644
 --- a/testmode.h
 +++ b/testmode.h
 @@ -19,6 +19,7 @@
@@ -717,7 +717,7 @@
  
  	/* keep last */
 diff --git a/tools/fields.c b/tools/fields.c
-index 406ba77..27801db 100644
+index 406ba77c..27801dbe 100644
 --- a/tools/fields.c
 +++ b/tools/fields.c
 @@ -11,6 +11,14 @@ static const char * const testmode_state[] = {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1010-wifi-mt76-testmode-add-iBF-command-mode-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1010-wifi-mt76-testmode-add-iBF-command-mode-support.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1010-wifi-mt76-testmode-add-iBF-command-mode-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1010-wifi-mt76-testmode-add-iBF-command-mode-support.patch
index 7713db3..edbae40 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1010-wifi-mt76-testmode-add-iBF-command-mode-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1010-wifi-mt76-testmode-add-iBF-command-mode-support.patch
@@ -1,7 +1,7 @@
-From ccf1ac17ba7b6c4cabe8f4e6557a57f66e9fbc7b Mon Sep 17 00:00:00 2001
+From a78a0de5858eba651ca9630dc8970c947b190b28 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Mon, 12 Sep 2022 18:16:54 +0800
-Subject: [PATCH 1010/1051] wifi: mt76: testmode: add iBF command mode support
+Subject: [PATCH 1010/1052] wifi: mt76: testmode: add iBF command mode support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
@@ -12,7 +12,7 @@
  4 files changed, 85 insertions(+), 7 deletions(-)
 
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index 4b34430..453319e 100644
+index 4b344303..453319e1 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -722,6 +722,7 @@ mt7915_tm_txbf_profile_update(struct mt7915_phy *phy, u16 *val, bool ebf)
@@ -104,7 +104,7 @@
  		mt7915_tm_set_tx_len(phy, tx_time);
  
 diff --git a/testmode.c b/testmode.c
-index 070b296..b1986ad 100644
+index 132267eb..06b10a36 100644
 --- a/testmode.c
 +++ b/testmode.c
 @@ -535,6 +535,42 @@ out:
@@ -163,7 +163,7 @@
  		nla_for_each_nested(cur, tb[MT76_TM_ATTR_TXBF_PARAM], rem) {
  			if (nla_len(cur) != 2 ||
 diff --git a/testmode.h b/testmode.h
-index e4c1b52..1d7aef8 100644
+index e4c1b521..1d7aef86 100644
 --- a/testmode.h
 +++ b/testmode.h
 @@ -285,8 +285,10 @@ enum mt76_testmode_txbf_act {
@@ -178,7 +178,7 @@
  
  	/* keep last */
 diff --git a/tools/fields.c b/tools/fields.c
-index 27801db..b0ee84d 100644
+index 27801dbe..b0ee84d2 100644
 --- a/tools/fields.c
 +++ b/tools/fields.c
 @@ -32,6 +32,20 @@ static const char * const testmode_tx_mode[] = {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1011-wifi-mt76-testmode-add-ZWDFS-test-mode-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1011-wifi-mt76-testmode-add-ZWDFS-test-mode-support.patch
similarity index 97%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1011-wifi-mt76-testmode-add-ZWDFS-test-mode-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1011-wifi-mt76-testmode-add-ZWDFS-test-mode-support.patch
index 3c95bdb..056c2b1 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1011-wifi-mt76-testmode-add-ZWDFS-test-mode-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1011-wifi-mt76-testmode-add-ZWDFS-test-mode-support.patch
@@ -1,7 +1,7 @@
-From d1999bcb10d6f3b0d97bad2ba47ea3bae1b38a52 Mon Sep 17 00:00:00 2001
+From 12f1e58ae28f7e12f298d213a0cfe13b751082df Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 27 Oct 2022 17:42:07 +0800
-Subject: [PATCH] wifi: mt76: testmode: add ZWDFS test mode support
+Subject: [PATCH 1011/1052] wifi: mt76: testmode: add ZWDFS test mode support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
@@ -18,7 +18,7 @@
  10 files changed, 508 insertions(+), 1 deletion(-)
 
 diff --git a/mt76.h b/mt76.h
-index 5dfae96..65ec039 100644
+index d8c2a515..15106812 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -793,6 +793,15 @@ struct mt76_testmode_data {
@@ -38,7 +38,7 @@
  
  struct mt76_vif {
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 6060eec..09d41b5 100644
+index cf88b674..40fa9fc8 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1243,6 +1243,7 @@ enum {
@@ -58,7 +58,7 @@
  
  enum {
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 17a23e3..3ba91a6 100644
+index d4291e24..500ecbbb 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -2759,6 +2759,7 @@ mt7915_mcu_background_chain_ctrl(struct mt7915_phy *phy,
@@ -139,7 +139,7 @@
 +	return 0;
 +}
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index c791c7f..066246b 100644
+index c791c7fa..066246bb 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -698,6 +698,52 @@ enum CSI_CHAIN_TYPE {
@@ -196,7 +196,7 @@
  #define OFDMA_DL                       BIT(0)
  #define OFDMA_UL                       BIT(1)
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index ca385b6..00f5544 100644
+index ca385b66..00f55443 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -306,6 +306,7 @@ struct mt7915_phy {
@@ -218,7 +218,7 @@
  int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir);
  int mt7915_dbg_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3, bool wait_resp);
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index 1236da9..7e9b76b 100644
+index 1236da91..7e9b76b0 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -1211,6 +1211,8 @@ enum offs_rev {
@@ -231,7 +231,7 @@
  #define MT_WF_PHY_BASE			0x83080000
  #define MT_WF_PHY(ofs)			(MT_WF_PHY_BASE + (ofs))
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index 453319e..caa3590 100644
+index 453319e1..caa35906 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -14,6 +14,12 @@ enum {
@@ -558,7 +558,7 @@
  
  static int
 diff --git a/testmode.c b/testmode.c
-index 06b10a3..d8fc5d6 100644
+index 06b10a36..d8fc5d6f 100644
 --- a/testmode.c
 +++ b/testmode.c
 @@ -26,6 +26,13 @@ const struct nla_policy mt76_tm_policy[NUM_MT76_TM_ATTRS] = {
@@ -622,7 +622,7 @@
  	     nla_put_u8(msg, MT76_TM_ATTR_TX_LTF, td->tx_ltf)) ||
  	    (mt76_testmode_param_present(td, MT76_TM_ATTR_TX_ANTENNA) &&
 diff --git a/testmode.h b/testmode.h
-index 1d7aef8..b39cf51 100644
+index 1d7aef86..b39cf511 100644
 --- a/testmode.h
 +++ b/testmode.h
 @@ -64,6 +64,20 @@
@@ -690,7 +690,7 @@
 +
  #endif
 diff --git a/tools/fields.c b/tools/fields.c
-index b0ee84d..e2cf4b9 100644
+index b0ee84d2..e2cf4b92 100644
 --- a/tools/fields.c
 +++ b/tools/fields.c
 @@ -46,6 +46,14 @@ static const char * const testmode_txbf_act[] = {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1012-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1012-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
similarity index 98%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1012-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1012-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
index d1a98ab..5795382 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1012-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1012-wifi-mt76-testmode-add-iBF-eBF-cal-and-cert-commands.patch
@@ -1,8 +1,8 @@
-From 5cdc71e26586cf3a314a0971a83a00181c3e305b Mon Sep 17 00:00:00 2001
+From d46a2b30adcdc8bca0f2a5012cd7bd4a3d59051b Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 15 Dec 2022 19:45:18 +0800
-Subject: [PATCH] wifi: mt76: testmode: add iBF/eBF cal and cert commands with
- golden
+Subject: [PATCH 1012/1052] wifi: mt76: testmode: add iBF/eBF cal and cert
+ commands with golden
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
@@ -25,7 +25,7 @@
  16 files changed, 859 insertions(+), 325 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 65ec039..4408ba8 100644
+index 15106812..9597f564 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -755,6 +755,7 @@ struct mt76_testmode_data {
@@ -47,7 +47,7 @@
  	u32 tx_pending;
  	u32 tx_queued;
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 44cd646..15e61c9 100644
+index 2acd7efb..0ce7ecdc 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -2688,6 +2688,7 @@ int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
@@ -68,7 +68,7 @@
  		memcpy(bss->bssid, phy->macaddr, ETH_ALEN);
  	}
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index b05e163..dc75ff1 100644
+index b05e1630..dc75ff1f 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -737,8 +737,10 @@ mt7915_mac_write_txwi_tm(struct mt7915_phy *phy, __le32 *txwi,
@@ -84,7 +84,7 @@
  	txwi[6] |= cpu_to_le32(val);
  #endif
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 8ec508d..b0e11f1 100644
+index 2e566710..4a541188 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -205,46 +205,37 @@ static void mt7915_init_bitrate_mask(struct ieee80211_vif *vif)
@@ -175,7 +175,7 @@
  
  	return ret;
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 3ba91a6..0b5b3ae 100644
+index 500ecbbb..6f05a081 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -199,6 +199,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
@@ -254,7 +254,7 @@
  		return -EINVAL;
  	}
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 066246b..de17c57 100644
+index 066246bb..de17c579 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -546,10 +546,12 @@ enum {
@@ -448,7 +448,7 @@
  	MURU_SET_ARB_OP_MODE = 14,
  	MURU_SET_PLATFORM_TYPE = 25,
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 222e2cf..ddf1b72 100644
+index 730cd338..ed15d711 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -133,6 +133,7 @@ static const u32 mt7915_offs[] = {
@@ -468,7 +468,7 @@
  	[AGG_AALCR0]		= 0x028,
  	[AGG_AWSCR0]		= 0x030,
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 00f5544..ef92b2e 100644
+index 00f55443..ef92b2ea 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -325,7 +325,6 @@ struct mt7915_phy {
@@ -523,7 +523,7 @@
 +
  #endif
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 54daa73..02fe61a 100644
+index 54daa736..02fe61a3 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -2888,6 +2888,36 @@ mt7915_txpower_level_set(void *data, u64 val)
@@ -576,7 +576,7 @@
  
  	return 0;
 diff --git a/mt7915/mtk_mcu.c b/mt7915/mtk_mcu.c
-index 143dae2..7a2d28c 100644
+index 143dae26..7a2d28c7 100644
 --- a/mt7915/mtk_mcu.c
 +++ b/mt7915/mtk_mcu.c
 @@ -1,9 +1,10 @@
@@ -840,7 +840,7 @@
 +}
 +#endif
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index 7e9b76b..4d05e39 100644
+index 7e9b76b0..4d05e391 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -61,6 +61,7 @@ enum offs_rev {
@@ -862,7 +862,7 @@
  #define MT_WF_RMAC_BASE(_band)		((_band) ? 0x820f5000 : 0x820e5000)
  #define MT_WF_RMAC(_band, ofs)		(MT_WF_RMAC_BASE(_band) + (ofs))
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index caa3590..faf6014 100644
+index caa35906..faf60146 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -55,6 +55,8 @@ struct reg_band {
@@ -1706,7 +1706,7 @@
  	rateval =  mode << 6 | rate_idx;
  	tx_cont->rateval = cpu_to_le16(rateval);
 diff --git a/mt7915/testmode.h b/mt7915/testmode.h
-index 7569826..5aba13c 100644
+index 75698261..5aba13cf 100644
 --- a/mt7915/testmode.h
 +++ b/mt7915/testmode.h
 @@ -311,137 +311,7 @@ struct mt7915_tm_muru {
@@ -1850,7 +1850,7 @@
  
  #endif
 diff --git a/testmode.c b/testmode.c
-index d8fc5d6..56b9205 100644
+index d8fc5d6f..56b92059 100644
 --- a/testmode.c
 +++ b/testmode.c
 @@ -196,6 +196,7 @@ mt76_testmode_alloc_skb(struct mt76_phy *phy, u32 len,
@@ -1862,7 +1862,7 @@
  	memcpy(hdr->addr2, addr[1], ETH_ALEN);
  	memcpy(hdr->addr3, addr[2], ETH_ALEN);
 diff --git a/testmode.h b/testmode.h
-index b39cf51..20fab3e 100644
+index b39cf511..20fab3ec 100644
 --- a/testmode.h
 +++ b/testmode.h
 @@ -303,7 +303,10 @@ enum mt76_testmode_cfg {
@@ -1890,7 +1890,7 @@
  	/* keep last */
  	NUM_MT76_TM_TXBF_ACT,
 diff --git a/tools/fields.c b/tools/fields.c
-index e2cf4b9..027b8cd 100644
+index e2cf4b92..027b8cdb 100644
 --- a/tools/fields.c
 +++ b/tools/fields.c
 @@ -33,7 +33,10 @@ static const char * const testmode_tx_mode[] = {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1013-wifi-mt76-connac-airtime-fairness-feature-off-in-mac.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1013-wifi-mt76-connac-airtime-fairness-feature-off-in-mac.patch
similarity index 79%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1013-wifi-mt76-connac-airtime-fairness-feature-off-in-mac.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1013-wifi-mt76-connac-airtime-fairness-feature-off-in-mac.patch
index 420358a..7879b85 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1013-wifi-mt76-connac-airtime-fairness-feature-off-in-mac.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1013-wifi-mt76-connac-airtime-fairness-feature-off-in-mac.patch
@@ -1,7 +1,7 @@
-From fa9a7d0143157226ec02bdfa64fa9e313f8b87ba Mon Sep 17 00:00:00 2001
+From 9e7d1c03b7944cd7a0641c68c9515f400e662451 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Fri, 6 May 2022 15:58:42 +0800
-Subject: [PATCH 1013/1051] wifi: mt76: connac: airtime fairness feature off in
+Subject: [PATCH 1013/1052] wifi: mt76: connac: airtime fairness feature off in
  mac80211
 
 ---
@@ -9,7 +9,7 @@
  1 file changed, 1 deletion(-)
 
 diff --git a/mac80211.c b/mac80211.c
-index 305cae7..f9dfdf8 100644
+index d6b70374..750a642a 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -451,7 +451,6 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-mt7915-add-phy-capability-vendor-command.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-mt7915-add-phy-capability-vendor-command.patch
similarity index 94%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-mt7915-add-phy-capability-vendor-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-mt7915-add-phy-capability-vendor-command.patch
index 2e16650..3357c0d 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-mt7915-add-phy-capability-vendor-command.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1014-wifi-mt76-mt7915-add-phy-capability-vendor-command.patch
@@ -1,7 +1,8 @@
-From 3982aaa49810c8f0b2c754bd6c7a2d2b21c45407 Mon Sep 17 00:00:00 2001
+From ea8636284d9278b7053ecedb02045be768d90957 Mon Sep 17 00:00:00 2001
 From: Yi-Chia Hsieh <Yi-Chia.Hsieh@mediatek.com>
 Date: Tue, 12 Jul 2022 10:04:35 -0700
-Subject: [PATCH] wifi: mt76: mt7915: add phy capability vendor command
+Subject: [PATCH 1014/1052] wifi: mt76: mt7915: add phy capability vendor
+ command
 
 ---
  mt7915/mt7915.h |  1 +
@@ -10,7 +11,7 @@
  3 files changed, 79 insertions(+)
 
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 1c1b3a1..f8ae363 100644
+index ef92b2ea..64cfa2e0 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -11,6 +11,7 @@
@@ -22,7 +23,7 @@
  #define MT7916_WTBL_SIZE		544
  #define MT7915_WTBL_RESERVED		(mt7915_wtbl_size(dev) - 1)
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 1beb603..e6cd79f 100644
+index cf09b513..9e8d2442 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
 @@ -52,6 +52,18 @@ rfeature_ctrl_policy[NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL] = {
@@ -99,7 +100,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 9cb6755..e58884c 100644
+index 9cb67551..e58884ce 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -10,6 +10,7 @@ enum mtk_nl80211_vendor_subcmds {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1015-wifi-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl-enable.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1015-wifi-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl-enable.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1015-wifi-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl-enable.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1015-wifi-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl-enable.patch
index c8d1472..a8230fb 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1015-wifi-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl-enable.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1015-wifi-mt76-mt7915-add-vendor-subcmd-EDCCA-ctrl-enable.patch
@@ -1,7 +1,7 @@
-From d49feab75f9fc7ffc5fd8b817b11c80251ec720c Mon Sep 17 00:00:00 2001
+From 31ecfaed704ad082d532a32ae5abd045f5d2f339 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Fri, 24 Jun 2022 11:15:45 +0800
-Subject: [PATCH] wifi: mt76: mt7915: add vendor subcmd EDCCA ctrl
+Subject: [PATCH 1015/1052] wifi: mt76: mt7915: add vendor subcmd EDCCA ctrl
  enable/threshold/compensation
 
 ---
@@ -15,7 +15,7 @@
  7 files changed, 264 insertions(+), 1 deletion(-)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 09d41b5..10b6133 100644
+index 40fa9fc8..a85179b8 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1254,6 +1254,7 @@ enum {
@@ -27,7 +27,7 @@
  	MCU_EXT_CMD_IPI_HIST_SCAN = 0xc5,
  };
 diff --git a/mt7915/main.c b/mt7915/main.c
-index b0e11f1..b1d7383 100644
+index 4a541188..de2f9098 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -479,6 +479,9 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
@@ -41,7 +41,7 @@
  		ret = mt7915_set_channel(phy);
  		if (ret)
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 0b5b3ae..0e04fc2 100644
+index 6f05a081..f83d969c 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -5037,3 +5037,75 @@ int mt7915_mcu_ipi_hist_scan(struct mt7915_phy *phy, void *data, u8 mode, bool w
@@ -121,7 +121,7 @@
 +	return 0;
 +}
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index de17c57..1682c11 100644
+index de17c579..1682c117 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -1128,6 +1128,27 @@ enum {
@@ -153,7 +153,7 @@
  
  #endif
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 64cfa2e..141c151 100644
+index 64cfa2e0..141c151e 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -789,7 +789,8 @@ void mt7915_vendor_amnt_fill_rx(struct mt7915_phy *phy, struct sk_buff *skb);
@@ -167,7 +167,7 @@
  int mt7915_mcu_ipi_hist_scan(struct mt7915_phy *phy, void *data, u8 mode, bool wait_resp);
  
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 9e8d244..aaa0cf1 100644
+index 9e8d2442..aaa0cf1d 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
 @@ -64,6 +64,24 @@ phy_capa_dump_policy[NUM_MTK_VENDOR_ATTRS_PHY_CAPA_DUMP] = {
@@ -324,7 +324,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index e58884c..c8d30b5 100644
+index e58884ce..c8d30b52 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -3,6 +3,7 @@
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1016-wifi-mt76-mt7915-implement-bin-file-mode.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1016-wifi-mt76-mt7915-implement-bin-file-mode.patch
similarity index 94%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1016-wifi-mt76-mt7915-implement-bin-file-mode.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1016-wifi-mt76-mt7915-implement-bin-file-mode.patch
index 956433c..9800bd2 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1016-wifi-mt76-mt7915-implement-bin-file-mode.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1016-wifi-mt76-mt7915-implement-bin-file-mode.patch
@@ -1,7 +1,7 @@
-From c4c1b1bf2d0630188f3e283d7f3856d0fb0700c6 Mon Sep 17 00:00:00 2001
+From 6aa933c1f0af48d3703f500dce4514b62d9d2121 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 7 Jul 2022 11:09:59 +0800
-Subject: [PATCH 1016/1051] wifi: mt76: mt7915: implement bin file mode
+Subject: [PATCH 1016/1052] wifi: mt76: mt7915: implement bin file mode
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
@@ -16,7 +16,7 @@
  7 files changed, 144 insertions(+), 4 deletions(-)
 
 diff --git a/eeprom.c b/eeprom.c
-index 3625b16..9d029c0 100644
+index 3625b169..9d029c04 100644
 --- a/eeprom.c
 +++ b/eeprom.c
 @@ -161,6 +161,31 @@ static int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int len)
@@ -52,7 +52,7 @@
  mt76_eeprom_override(struct mt76_phy *phy)
  {
 diff --git a/mt76.h b/mt76.h
-index 1455144..fbcdfa9 100644
+index 9597f564..253a564f 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -983,6 +983,9 @@ struct mt76_dev {
@@ -74,7 +74,7 @@
  struct mt76_queue *
  mt76_init_queue(struct mt76_dev *dev, int qid, int idx, int n_desc,
 diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c
-index f4876fe..c8b1c18 100644
+index f4876fe9..c8b1c18e 100644
 --- a/mt7915/eeprom.c
 +++ b/mt7915/eeprom.c
 @@ -5,6 +5,30 @@
@@ -196,7 +196,7 @@
  		if (ret)
  			return ret;
 diff --git a/mt7915/eeprom.h b/mt7915/eeprom.h
-index 509fb43..99101f9 100644
+index 509fb43d..99101f91 100644
 --- a/mt7915/eeprom.h
 +++ b/mt7915/eeprom.h
 @@ -109,6 +109,13 @@ enum mt7915_sku_rate_group {
@@ -214,10 +214,10 @@
  mt7915_get_channel_group_5g(int channel, bool is_7976)
  {
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index ea450ae..28403c9 100644
+index 141c151e..2fb8e2fb 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -399,6 +399,8 @@ struct mt7915_dev {
+@@ -414,6 +414,8 @@ struct mt7915_dev {
  
  	bool dbdc_support;
  	bool flash_mode;
@@ -226,7 +226,7 @@
  	bool muru_debug;
  	bool ibf;
  
-@@ -786,6 +788,7 @@ void mt7915_dump_tmac_info(u8 *tmac_info);
+@@ -802,6 +804,7 @@ void mt7915_dump_tmac_info(u8 *tmac_info);
  int mt7915_mcu_set_txpower_level(struct mt7915_phy *phy, u8 drop_level);
  void mt7915_packet_log_to_host(struct mt7915_dev *dev, const void *data, int len, int type, int des_len);
  int mt7915_mcu_set_amsdu_algo(struct mt7915_dev *dev, u16 wcid, u8 enable);
@@ -235,7 +235,7 @@
  #define PKT_BIN_DEBUG_MAGIC	0xc8763123
  enum {
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 9e490ad..17577fd 100644
+index 02fe61a3..76f4849e 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3,6 +3,7 @@
@@ -304,7 +304,7 @@
  }
  #endif
 diff --git a/testmode.h b/testmode.h
-index 20fab3e..91d1e86 100644
+index 20fab3ec..91d1e867 100644
 --- a/testmode.h
 +++ b/testmode.h
 @@ -17,7 +17,7 @@
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1017-wifi-mt76-mt7915-Add-mu-dump-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1017-wifi-mt76-mt7915-Add-mu-dump-support.patch
similarity index 82%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1017-wifi-mt76-mt7915-Add-mu-dump-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1017-wifi-mt76-mt7915-Add-mu-dump-support.patch
index 30998f6..8e1378e 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1017-wifi-mt76-mt7915-Add-mu-dump-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1017-wifi-mt76-mt7915-Add-mu-dump-support.patch
@@ -1,7 +1,7 @@
-From fdac49c9616d72b03e0ba8ab1f17d777db8876cf Mon Sep 17 00:00:00 2001
+From 0623b3b87fe33c6ad8037aa01cf63b2a1ab2274f Mon Sep 17 00:00:00 2001
 From: TomLiu <tomml.liu@mediatek.com>
 Date: Thu, 11 Aug 2022 18:09:45 -0700
-Subject: [PATCH 1017/1051] wifi: mt76: mt7915: Add mu dump support
+Subject: [PATCH 1017/1052] wifi: mt76: mt7915: Add mu dump support
 
 ---
  mt7915/vendor.c | 24 ++++++++++++++++++++++++
@@ -9,10 +9,10 @@
  2 files changed, 25 insertions(+)
 
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 3a58684..ac6f637 100644
+index aaa0cf1d..eb0b380d 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -38,6 +38,7 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
+@@ -39,6 +39,7 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
  static const struct nla_policy
  mu_ctrl_policy[NUM_MTK_VENDOR_ATTRS_MU_CTRL] = {
  	[MTK_VENDOR_ATTR_MU_CTRL_ONOFF] = {.type = NLA_U8 },
@@ -20,7 +20,7 @@
  };
  
  static const struct nla_policy
-@@ -1025,6 +1026,28 @@ static int mt7915_vendor_mu_ctrl(struct wiphy *wiphy,
+@@ -1161,6 +1162,28 @@ static int mt7915_vendor_mu_ctrl(struct wiphy *wiphy,
  	return 0;
  }
  
@@ -49,7 +49,7 @@
  static int
  mt7915_vendor_phy_capa_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
  			     struct sk_buff *skb, const void *data, int data_len,
-@@ -1211,6 +1234,7 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1347,6 +1370,7 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
  			WIPHY_VENDOR_CMD_NEED_RUNNING,
  		.doit = mt7915_vendor_mu_ctrl,
@@ -58,7 +58,7 @@
  		.maxattr = MTK_VENDOR_ATTR_MU_CTRL_MAX,
  	},
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 284994a..8c2a996 100644
+index c8d30b52..c61ba260 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -73,6 +73,7 @@ enum mtk_vendor_attr_mu_ctrl {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1018-wifi-mt76-mt7915-add-vendor-subcmd-three-wire-PTA-ct.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1018-wifi-mt76-mt7915-add-vendor-subcmd-three-wire-PTA-ct.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1018-wifi-mt76-mt7915-add-vendor-subcmd-three-wire-PTA-ct.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1018-wifi-mt76-mt7915-add-vendor-subcmd-three-wire-PTA-ct.patch
index 0b9b72a..90266c6 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1018-wifi-mt76-mt7915-add-vendor-subcmd-three-wire-PTA-ct.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1018-wifi-mt76-mt7915-add-vendor-subcmd-three-wire-PTA-ct.patch
@@ -1,7 +1,7 @@
-From 14f9e5f7f36380a64d158e31f60956ddec016245 Mon Sep 17 00:00:00 2001
+From a2610e02282fb1825cdc2d76ebff9e979a6a977c Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Fri, 28 Oct 2022 10:15:56 +0800
-Subject: [PATCH 1018/1051] wifi: mt76: mt7915: add vendor subcmd three wire
+Subject: [PATCH 1018/1052] wifi: mt76: mt7915: add vendor subcmd three wire
  (PTA) ctrl
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -15,10 +15,10 @@
  6 files changed, 111 insertions(+), 29 deletions(-)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 012f9be..7e12c05 100644
+index a85179b8..e7eb6a93 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1251,7 +1251,7 @@ enum {
+@@ -1253,7 +1253,7 @@ enum {
  	MCU_EXT_CMD_SMESH_CTRL = 0xae,
  	MCU_EXT_CMD_RX_STAT_USER_CTRL = 0xb3,
  	MCU_EXT_CMD_SET_QOS_MAP = 0xb4,
@@ -28,7 +28,7 @@
  	MCU_EXT_CMD_CSI_CTRL = 0xc2,
  	MCU_EXT_CMD_IPI_HIST_SCAN = 0xc5,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index badc831..89b35e8 100644
+index f83d969c..3e4239f6 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -4736,37 +4736,33 @@ void mt7915_mcu_set_dynalgo(struct mt7915_phy *phy, u8 enable)
@@ -93,7 +93,7 @@
  
  void mt7915_mcu_set_bypass_smthint(struct mt7915_phy *phy, u8 val)
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 1682c11..1b0bd06 100644
+index 1682c117..1b0bd06b 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -916,6 +916,35 @@ struct mt7915_mcu_rdd_ipi_scan {
@@ -133,10 +133,10 @@
  #define OFDMA_DL                       BIT(0)
  #define OFDMA_UL                       BIT(1)
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 28403c9..d9a885d 100644
+index 2fb8e2fb..6027e7f7 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -767,6 +767,7 @@ void mt7915_mcu_set_mimo(struct mt7915_phy *phy, u8 direction);
+@@ -781,6 +781,7 @@ void mt7915_mcu_set_mimo(struct mt7915_phy *phy, u8 direction);
  void mt7915_mcu_set_dynalgo(struct mt7915_phy *phy, u8 enable);
  int mt7915_mcu_set_mu_edca(struct mt7915_phy *phy, u8 val);
  void mt7915_mcu_set_cert(struct mt7915_phy *phy, u8 type);
@@ -145,10 +145,10 @@
  void mt7915_vendor_register(struct mt7915_phy *phy);
  int mt7915_mcu_set_csi(struct mt7915_phy *phy, u8 mode,
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index ac6f637..eeac18d 100644
+index eb0b380d..54b89030 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -41,6 +41,11 @@ mu_ctrl_policy[NUM_MTK_VENDOR_ATTRS_MU_CTRL] = {
+@@ -42,6 +42,11 @@ mu_ctrl_policy[NUM_MTK_VENDOR_ATTRS_MU_CTRL] = {
  	[MTK_VENDOR_ATTR_MU_CTRL_DUMP] = {.type = NLA_U8 },
  };
  
@@ -160,7 +160,7 @@
  static const struct nla_policy
  rfeature_ctrl_policy[NUM_MTK_VENDOR_ATTRS_RFEATURE_CTRL] = {
  	[MTK_VENDOR_ATTR_RFEATURE_CTRL_HE_GI] = {.type = NLA_U8 },
-@@ -992,7 +997,7 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
+@@ -1128,7 +1133,7 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
  			mt7915_set_wireless_vif, &val32);
  	} else if (tb[MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT]) {
  		val8 = nla_get_u8(tb[MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT]);
@@ -169,7 +169,7 @@
  		mt7915_mcu_set_bypass_smthint(phy, val8); /* Cert bypass smooth interpolation */
  	}
  
-@@ -1136,6 +1141,7 @@ static int mt7915_vendor_edcca_ctrl(struct wiphy *wiphy,
+@@ -1272,6 +1277,7 @@ static int mt7915_vendor_edcca_ctrl(struct wiphy *wiphy,
  	return 0;
  }
  
@@ -177,7 +177,7 @@
  static int
  mt7915_vendor_edcca_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
  			     struct sk_buff *skb, const void *data, int data_len,
-@@ -1179,6 +1185,31 @@ mt7915_vendor_edcca_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
+@@ -1315,6 +1321,31 @@ mt7915_vendor_edcca_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
  	return len;
  }
  
@@ -209,7 +209,7 @@
  static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  	{
  		.info = {
-@@ -1260,6 +1291,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1396,6 +1427,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.dumpit = mt7915_vendor_edcca_ctrl_dump,
  		.policy = edcca_ctrl_policy,
  		.maxattr = MTK_VENDOR_ATTR_EDCCA_CTRL_MAX,
@@ -228,7 +228,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 8c2a996..e61a6aa 100644
+index c61ba260..ddde0cc0 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -13,6 +13,7 @@ enum mtk_nl80211_vendor_subcmds {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1019-wifi-mt76-mt7915-add-ibf-control-vendor-cmd.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1019-wifi-mt76-mt7915-add-ibf-control-vendor-cmd.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1019-wifi-mt76-mt7915-add-ibf-control-vendor-cmd.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1019-wifi-mt76-mt7915-add-ibf-control-vendor-cmd.patch
index 60b7d81..cfd1574 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1019-wifi-mt76-mt7915-add-ibf-control-vendor-cmd.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1019-wifi-mt76-mt7915-add-ibf-control-vendor-cmd.patch
@@ -1,7 +1,7 @@
-From b523d127286292b2915eda127d35001ee67ab461 Mon Sep 17 00:00:00 2001
+From 95a5898db592cf183d3275e67a511f3ad5c2f541 Mon Sep 17 00:00:00 2001
 From: mtk27835 <shurong.wen@mediatek.com>
 Date: Wed, 7 Sep 2022 14:01:29 -0700
-Subject: [PATCH 1019/1051] wifi: mt76: mt7915: add ibf control vendor cmd
+Subject: [PATCH 1019/1052] wifi: mt76: mt7915: add ibf control vendor cmd
 
 Signed-off-by: mtk27835 <shurong.wen@mediatek.com>
 ---
@@ -10,10 +10,10 @@
  2 files changed, 89 insertions(+), 1 deletion(-)
 
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index eeac18d..a21cbce 100644
+index 54b89030..b4facaaa 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -87,6 +87,11 @@ edcca_dump_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_DUMP] = {
+@@ -88,6 +88,11 @@ edcca_dump_policy[NUM_MTK_VENDOR_ATTRS_EDCCA_DUMP] = {
         [MTK_VENDOR_ATTR_EDCCA_DUMP_SEC80_VAL] = { .type = NLA_U8 },
  };
  
@@ -25,7 +25,7 @@
  struct csi_null_tone {
  	u8 start;
  	u8 end;
-@@ -1209,6 +1214,54 @@ static int mt7915_vendor_3wire_ctrl(struct wiphy *wiphy,
+@@ -1345,6 +1350,54 @@ static int mt7915_vendor_3wire_ctrl(struct wiphy *wiphy,
  	return mt7915_mcu_set_cfg(phy, CFGINFO_3WIRE_EN_CFG, three_wire_mode);
  }
  
@@ -80,7 +80,7 @@
  
  static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  	{
-@@ -1302,6 +1355,18 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1438,6 +1491,18 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.doit = mt7915_vendor_3wire_ctrl,
  		.policy = three_wire_ctrl_policy,
  		.maxattr = MTK_VENDOR_ATTR_3WIRE_CTRL_MAX,
@@ -100,7 +100,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index e61a6aa..876edf3 100644
+index ddde0cc0..24f35c8e 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -13,7 +13,8 @@ enum mtk_nl80211_vendor_subcmds {
@@ -113,7 +113,7 @@
  };
  
  
-@@ -225,4 +226,26 @@ enum mtk_vendor_attr_phy_capa_dump {
+@@ -238,4 +239,26 @@ enum mtk_vendor_attr_phy_capa_dump {
  		NUM_MTK_VENDOR_ATTRS_PHY_CAPA_DUMP - 1
  };
  
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1020-wifi-mt76-mt7915-add-cal-free-data-merge-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1020-wifi-mt76-mt7915-add-cal-free-data-merge-support.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1020-wifi-mt76-mt7915-add-cal-free-data-merge-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1020-wifi-mt76-mt7915-add-cal-free-data-merge-support.patch
index 7b56f68..a16e386 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1020-wifi-mt76-mt7915-add-cal-free-data-merge-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1020-wifi-mt76-mt7915-add-cal-free-data-merge-support.patch
@@ -1,7 +1,7 @@
-From 4f16df4de5a3b2d9080a7c07bfc1f0496de442cd Mon Sep 17 00:00:00 2001
+From 1c8aa13277994e9d4bedcc2399bdcbd73d3612ef Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 30 Mar 2023 15:12:37 +0800
-Subject: [PATCH] wifi: mt76: mt7915: add cal free data merge support
+Subject: [PATCH 1020/1052] wifi: mt76: mt7915: add cal free data merge support
 
 1. add basic cal free data support
 2. add E3 low yield rate workaround for panther E3 with 7976 adie
@@ -19,7 +19,7 @@
  5 files changed, 250 insertions(+), 6 deletions(-)
 
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 909df24..c369296 100644
+index 909df246..c3692969 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -1286,6 +1286,46 @@ static const struct file_operations mt7915_csi_ops = {
@@ -78,7 +78,7 @@
  	debugfs_create_file("csi_stats", 0400, dir, phy, &mt7915_csi_ops);
  #endif
 diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c
-index c8b1c18..6133c20 100644
+index c8b1c18e..6133c200 100644
 --- a/mt7915/eeprom.c
 +++ b/mt7915/eeprom.c
 @@ -48,8 +48,13 @@ static int mt7915_eeprom_load_precal(struct mt7915_dev *dev)
@@ -309,7 +309,7 @@
  	memcpy(dev->mphy.macaddr, dev->mt76.eeprom.data + MT_EE_MAC_ADDR,
  	       ETH_ALEN);
 diff --git a/mt7915/eeprom.h b/mt7915/eeprom.h
-index 99101f9..70fca0b 100644
+index 99101f91..70fca0b3 100644
 --- a/mt7915/eeprom.h
 +++ b/mt7915/eeprom.h
 @@ -68,6 +68,8 @@ enum mt7915_eeprom_field {
@@ -322,7 +322,7 @@
  	MT7976_ONE_ADIE_DBDC = 0x7,
  	MT7975_ONE_ADIE	= 0x8,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index cf622de..7bc5182 100644
+index 3e4239f6..85112791 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -2968,6 +2968,7 @@ int mt7915_mcu_get_eeprom(struct mt7915_dev *dev, u32 offset, u8 *read_buf)
@@ -353,10 +353,10 @@
  	dev_kfree_skb(skb);
  
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 3fe901d..5ba6986 100644
+index 6027e7f7..7d068e1e 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -581,6 +581,7 @@ u32 mt7915_wed_init_buf(void *ptr, dma_addr_t phys, int token_id);
+@@ -579,6 +579,7 @@ u32 mt7915_wed_init_buf(void *ptr, dma_addr_t phys, int token_id);
  
  int mt7915_register_device(struct mt7915_dev *dev);
  void mt7915_unregister_device(struct mt7915_dev *dev);
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1021-wifi-mt76-mt7915-support-on-off-SW-ACI-through-debug.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1021-wifi-mt76-mt7915-support-on-off-SW-ACI-through-debug.patch
similarity index 87%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1021-wifi-mt76-mt7915-support-on-off-SW-ACI-through-debug.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1021-wifi-mt76-mt7915-support-on-off-SW-ACI-through-debug.patch
index 11f05a7..610fecd 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1021-wifi-mt76-mt7915-support-on-off-SW-ACI-through-debug.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1021-wifi-mt76-mt7915-support-on-off-SW-ACI-through-debug.patch
@@ -1,7 +1,7 @@
-From 615af047639896e1d92edf7c18322a1a6d993e92 Mon Sep 17 00:00:00 2001
+From cf95b91353888672b8fcf839592760de4d5f93ac Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Fri, 14 Oct 2022 11:15:13 +0800
-Subject: [PATCH 1021/1051] wifi: mt76: mt7915: support on off SW ACI through
+Subject: [PATCH 1021/1052] wifi: mt76: mt7915: support on off SW ACI through
  debugfs
 
 Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
@@ -11,10 +11,10 @@
  2 files changed, 22 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 7e12c05..94fcf32 100644
+index e7eb6a93..49c3f1aa 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1253,6 +1253,7 @@ enum {
+@@ -1255,6 +1255,7 @@ enum {
  	MCU_EXT_CMD_SET_QOS_MAP = 0xb4,
  	MCU_EXT_CMD_SET_CFG = 0xb7,
  	MCU_EXT_CMD_EDCCA = 0xba,
@@ -23,7 +23,7 @@
  	MCU_EXT_CMD_IPI_HIST_SCAN = 0xc5,
  };
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 17577fd..8f2f496 100644
+index 76f4849e..3e84d753 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3770,6 +3770,25 @@ static int mt7915_show_eeprom_mode(struct seq_file *s, void *data)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1022-wifi-mt76-mt7915-add-bf-backoff-limit-table-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1022-wifi-mt76-mt7915-add-bf-backoff-limit-table-support.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1022-wifi-mt76-mt7915-add-bf-backoff-limit-table-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1022-wifi-mt76-mt7915-add-bf-backoff-limit-table-support.patch
index 62eec89..100d631 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1022-wifi-mt76-mt7915-add-bf-backoff-limit-table-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1022-wifi-mt76-mt7915-add-bf-backoff-limit-table-support.patch
@@ -1,7 +1,7 @@
-From 942b504ff8a04d6faf2023418946be2167bd67d0 Mon Sep 17 00:00:00 2001
+From 94af1c45316f8510f60afd0348918345757f1c20 Mon Sep 17 00:00:00 2001
 From: Shayne Chen <shayne.chen@mediatek.com>
 Date: Mon, 5 Dec 2022 18:21:51 +0800
-Subject: [PATCH 1022/1051] wifi: mt76: mt7915: add bf backoff limit table
+Subject: [PATCH 1022/1052] wifi: mt76: mt7915: add bf backoff limit table
  support
 
 Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
@@ -18,7 +18,7 @@
  9 files changed, 275 insertions(+), 54 deletions(-)
 
 diff --git a/debugfs.c b/debugfs.c
-index 1c8328d..a626f7c 100644
+index 1c8328d5..a626f7cf 100644
 --- a/debugfs.c
 +++ b/debugfs.c
 @@ -95,9 +95,9 @@ void mt76_seq_puts_array(struct seq_file *file, const char *str,
@@ -34,7 +34,7 @@
  }
  EXPORT_SYMBOL_GPL(mt76_seq_puts_array);
 diff --git a/eeprom.c b/eeprom.c
-index 9d029c0..aa33e7b 100644
+index 9d029c04..aa33e7b5 100644
 --- a/eeprom.c
 +++ b/eeprom.c
 @@ -336,9 +336,10 @@ mt76_apply_array_limit(s8 *pwr, size_t pwr_len, const __be32 *data,
@@ -115,7 +115,7 @@
  	return max_power;
  }
 diff --git a/mt76.h b/mt76.h
-index fbcdfa9..54f805e 100644
+index 253a564f..580320fd 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -1089,6 +1089,14 @@ struct mt76_power_limits {
@@ -134,7 +134,7 @@
  
  struct mt76_ethtool_worker_info {
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 5c08910..fa1d2ac 100644
+index c3692969..3830a735 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -1020,7 +1020,7 @@ mt7915_rate_txpower_get(struct file *file, char __user *user_buf,
@@ -234,7 +234,7 @@
  static int
  mt7915_twt_stats(struct seq_file *s, void *data)
  {
-@@ -1310,7 +1373,9 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
+@@ -1355,7 +1418,9 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
  	debugfs_create_file("implicit_txbf", 0600, dir, dev,
  			    &fops_implicit_txbf);
  	debugfs_create_file("txpower_sku", 0400, dir, phy,
@@ -246,10 +246,10 @@
  				    mt7915_twt_stats);
  	debugfs_create_file("rf_regval", 0600, dir, dev, &fops_rf_regval);
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 0994b8a..f548d09 100644
+index 0c58ab7b..a9cb496b 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -284,6 +284,8 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
+@@ -285,6 +285,8 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
  	int pwr_delta = mt7915_eeprom_get_power_delta(dev, sband->band);
  	struct mt76_power_limits limits;
  
@@ -258,7 +258,7 @@
  	for (i = 0; i < sband->n_channels; i++) {
  		struct ieee80211_channel *chan = &sband->channels[i];
  		u32 target_power = 0;
-@@ -300,6 +302,11 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
+@@ -301,6 +303,11 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
  		target_power = mt76_get_rate_power_limits(phy->mt76, chan,
  							  &limits,
  							  target_power);
@@ -271,7 +271,7 @@
  		target_power = DIV_ROUND_UP(target_power, 2);
  		chan->max_power = min_t(int, chan->max_reg_power,
 diff --git a/mt7915/main.c b/mt7915/main.c
-index f927c5a..4e1a430 100644
+index de2f9098..4a5a0155 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -73,11 +73,7 @@ int mt7915_run(struct ieee80211_hw *hw)
@@ -288,7 +288,7 @@
  		goto out;
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 372168d..4225e97 100644
+index 85112791..1b5ef875 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -3422,7 +3422,8 @@ int mt7915_mcu_set_txpower_frame(struct mt7915_phy *phy,
@@ -536,7 +536,7 @@
  	return mt76_mcu_send_msg(&dev->mt76,
  				 MCU_EXT_CMD(TX_POWER_FEATURE_CTRL), &req,
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 1b0bd06..94eff26 100644
+index 1b0bd06b..94eff268 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -517,12 +517,18 @@ enum {
@@ -559,7 +559,7 @@
  	SPR_ENABLE = 0x1,
  	SPR_ENABLE_SD = 0x3,
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index d32b12f..c595d81 100644
+index 7d068e1e..437cfb63 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -72,6 +72,7 @@
@@ -570,7 +570,7 @@
  
  #define MT7915_MAX_TWT_AGRT		16
  #define MT7915_MAX_STA_TWT_AGRT		8
-@@ -302,6 +303,9 @@ struct mt7915_phy {
+@@ -313,6 +314,9 @@ struct mt7915_phy {
  	struct list_head stats_list;
  	spinlock_t stats_lock;
  
@@ -580,7 +580,7 @@
  #ifdef CONFIG_NL80211_TESTMODE
  	struct {
  		u32 *reg_backup;
-@@ -628,9 +632,10 @@ int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band, bool enable,
+@@ -643,9 +647,10 @@ int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band, bool enable,
  int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,
  			      u8 en);
  int mt7915_mcu_set_ser(struct mt7915_dev *dev, u8 action, u8 set, u8 band);
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1023-wifi-mt76-mt7915-amsdu-set-and-get-control.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1023-wifi-mt76-mt7915-amsdu-set-and-get-control.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1023-wifi-mt76-mt7915-amsdu-set-and-get-control.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1023-wifi-mt76-mt7915-amsdu-set-and-get-control.patch
index c95aa26..72fd7b9 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1023-wifi-mt76-mt7915-amsdu-set-and-get-control.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1023-wifi-mt76-mt7915-amsdu-set-and-get-control.patch
@@ -1,7 +1,7 @@
-From 0f64ab075028815e91162e78ba308d5022b89c85 Mon Sep 17 00:00:00 2001
+From 71155a316facf65574dc5a03cc6c70a824c3d220 Mon Sep 17 00:00:00 2001
 From: TomLiu <tomml.liu@mediatek.com>
 Date: Wed, 14 Dec 2022 00:44:07 -0800
-Subject: [PATCH 1023/1051] wifi: mt76: mt7915: amsdu set and get control
+Subject: [PATCH 1023/1052] wifi: mt76: mt7915: amsdu set and get control
 
 ---
  mt7915/mac.c    |  7 +++++++
@@ -11,7 +11,7 @@
  4 files changed, 50 insertions(+)
 
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index dc75ff1..e14b3fd 100644
+index dc75ff1f..e14b3fdd 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1994,6 +1994,13 @@ static void mt7915_mac_sta_stats_work(struct mt7915_phy *phy)
@@ -29,10 +29,10 @@
  void mt7915_capi_sta_rc_work(void *data, struct ieee80211_sta *sta)
  {
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index c595d81..804d554 100644
+index 437cfb63..82d374eb 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -761,6 +761,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
+@@ -775,6 +775,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
  			 bool pci, int *irq);
  
  #ifdef CONFIG_MTK_VENDOR
@@ -41,10 +41,10 @@
  void mt7915_set_wireless_vif(void *data, u8 *mac, struct ieee80211_vif *vif);
  void mt7915_mcu_set_rfeature_starec(void *data, struct mt7915_dev *dev,
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index a21cbce..e25a0ce 100644
+index b4facaaa..4848e0a1 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -31,10 +31,16 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
+@@ -32,10 +32,16 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
  	[MTK_VENDOR_ATTR_WIRELESS_CTRL_NUSERS_OFDMA] = {.type = NLA_U8 },
  	[MTK_VENDOR_ATTR_WIRELESS_CTRL_MIMO] = {.type = NLA_U8 },
  	[MTK_VENDOR_ATTR_WIRELESS_CTRL_BA_BUFFER_SIZE] = {.type = NLA_U16 },
@@ -61,7 +61,7 @@
  static const struct nla_policy
  mu_ctrl_policy[NUM_MTK_VENDOR_ATTRS_MU_CTRL] = {
  	[MTK_VENDOR_ATTR_MU_CTRL_ONOFF] = {.type = NLA_U8 },
-@@ -1004,11 +1010,34 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
+@@ -1140,11 +1146,34 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
  		val8 = nla_get_u8(tb[MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT]);
  		mt7915_mcu_set_cfg(phy, CFGINFO_CERT_CFG, val8); /* Cert Enable for OMI */
  		mt7915_mcu_set_bypass_smthint(phy, val8); /* Cert bypass smooth interpolation */
@@ -96,7 +96,7 @@
  static int mt7915_vendor_mu_ctrl(struct wiphy *wiphy,
  				  struct wireless_dev *wdev,
  				  const void *data,
-@@ -1307,6 +1336,7 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1443,6 +1472,7 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
  			WIPHY_VENDOR_CMD_NEED_RUNNING,
  		.doit = mt7915_vendor_wireless_ctrl,
@@ -105,7 +105,7 @@
  		.maxattr = MTK_VENDOR_ATTR_WIRELESS_CTRL_MAX,
  	},
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 876edf3..7c4e914 100644
+index 24f35c8e..8a13b3a3 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -75,6 +75,7 @@ enum mtk_vendor_attr_wireless_ctrl {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1024-wifi-mt76-mt7915-Add-vendor-command-attribute-for-RT.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1024-wifi-mt76-mt7915-Add-vendor-command-attribute-for-RT.patch
similarity index 87%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1024-wifi-mt76-mt7915-Add-vendor-command-attribute-for-RT.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1024-wifi-mt76-mt7915-Add-vendor-command-attribute-for-RT.patch
index 7951f6c..153f1e3 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1024-wifi-mt76-mt7915-Add-vendor-command-attribute-for-RT.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1024-wifi-mt76-mt7915-Add-vendor-command-attribute-for-RT.patch
@@ -1,7 +1,7 @@
-From 0b4edb9d0fa52ebe9bf4a1c1f152515296afc657 Mon Sep 17 00:00:00 2001
+From fbbc0bb4591648f645ed1b0b43f77e9922ecdfdd Mon Sep 17 00:00:00 2001
 From: "himanshu.goyal" <himanshu.goyal@mediatek.com>
 Date: Tue, 24 Jan 2023 14:32:08 +0800
-Subject: [PATCH 1024/1051] wifi: mt76: mt7915: Add vendor command attribute
+Subject: [PATCH 1024/1052] wifi: mt76: mt7915: Add vendor command attribute
  for RTS BW signaling.
 
 Signed-off-by: himanshu.goyal <himanshu.goyal@mediatek.com>
@@ -13,7 +13,7 @@
  4 files changed, 20 insertions(+)
 
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 4225e97..2e6eefc 100644
+index 1b5ef875..ca18acfb 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -4863,6 +4863,12 @@ int mt7915_mcu_set_cfg(struct mt7915_phy *phy, u8 cfg_info, u8 type)
@@ -30,7 +30,7 @@
  		tlv_len = sizeof(struct three_wire_cfg);
  		req.three_wire.tag = cpu_to_le16(cfg_info);
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 94eff26..6ebcce0 100644
+index 94eff268..6ebcce0d 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -936,6 +936,13 @@ struct three_wire_cfg {
@@ -62,10 +62,10 @@
  };
  
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index e25a0ce..8370216 100644
+index 4848e0a1..35891d49 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -34,6 +34,7 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
+@@ -35,6 +35,7 @@ wireless_ctrl_policy[NUM_MTK_VENDOR_ATTRS_WIRELESS_CTRL] = {
  	[MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU] = {.type = NLA_U8 },
  	[MTK_VENDOR_ATTR_WIRELESS_CTRL_MU_EDCA] = {.type = NLA_U8 },
  	[MTK_VENDOR_ATTR_WIRELESS_CTRL_CERT] = {.type = NLA_U8 },
@@ -73,7 +73,7 @@
  };
  
  static const struct nla_policy
-@@ -1013,6 +1014,9 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
+@@ -1149,6 +1150,9 @@ static int mt7915_vendor_wireless_ctrl(struct wiphy *wiphy,
  	} else if (tb[MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU]) {
  		val8 = nla_get_u8(tb[MTK_VENDOR_ATTR_WIRELESS_CTRL_AMSDU]);
  		mt7915_set_wireless_amsdu(hw, val8);
@@ -84,7 +84,7 @@
  
  	return 0;
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 7c4e914..3672420 100644
+index 8a13b3a3..f91ad695 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -77,6 +77,7 @@ enum mtk_vendor_attr_wireless_ctrl {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1025-wifi-mt76-mt7915-add-vendor-cmd-to-get-available-col.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1025-wifi-mt76-mt7915-add-vendor-cmd-to-get-available-col.patch
similarity index 85%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1025-wifi-mt76-mt7915-add-vendor-cmd-to-get-available-col.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1025-wifi-mt76-mt7915-add-vendor-cmd-to-get-available-col.patch
index 9522fb0..dc85870 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1025-wifi-mt76-mt7915-add-vendor-cmd-to-get-available-col.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1025-wifi-mt76-mt7915-add-vendor-cmd-to-get-available-col.patch
@@ -1,7 +1,7 @@
-From 399d30ba0e363d9c2f8a438fe2ed2154e6a7a02f Mon Sep 17 00:00:00 2001
+From a48f497ea998ba30f4ee8ab7e5c41e0eb7738119 Mon Sep 17 00:00:00 2001
 From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
 Date: Thu, 26 Jan 2023 08:50:47 +0800
-Subject: [PATCH 1025/1051] wifi: mt76: mt7915: add vendor cmd to get available
+Subject: [PATCH 1025/1052] wifi: mt76: mt7915: add vendor cmd to get available
  color bitmap
 
 Add a vendor cmd to notify user space available color bitmap.
@@ -14,10 +14,10 @@
  2 files changed, 48 insertions(+)
 
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 8370216..9a26f7f 100644
+index 35891d49..df08704b 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -99,6 +99,11 @@ ibf_ctrl_policy[NUM_MTK_VENDOR_ATTRS_IBF_CTRL] = {
+@@ -100,6 +100,11 @@ ibf_ctrl_policy[NUM_MTK_VENDOR_ATTRS_IBF_CTRL] = {
  	[MTK_VENDOR_ATTR_IBF_CTRL_ENABLE] = { .type = NLA_U8 },
  };
  
@@ -29,7 +29,7 @@
  struct csi_null_tone {
  	u8 start;
  	u8 end;
-@@ -1295,6 +1300,27 @@ mt7915_vendor_ibf_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
+@@ -1431,6 +1436,27 @@ mt7915_vendor_ibf_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev,
  	return 1;
  }
  
@@ -57,7 +57,7 @@
  
  static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  	{
-@@ -1401,6 +1427,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1537,6 +1563,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.dumpit = mt7915_vendor_ibf_ctrl_dump,
  		.policy = ibf_ctrl_policy,
  		.maxattr = MTK_VENDOR_ATTR_IBF_CTRL_MAX,
@@ -76,7 +76,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 3672420..bd1c617 100644
+index f91ad695..5b8d99bf 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -15,6 +15,7 @@ enum mtk_nl80211_vendor_subcmds {
@@ -87,7 +87,7 @@
  };
  
  
-@@ -261,4 +262,14 @@ enum mtk_vendor_attr_ibf_dump {
+@@ -274,4 +275,14 @@ enum mtk_vendor_attr_ibf_dump {
  		NUM_MTK_VENDOR_ATTRS_IBF_DUMP - 1
  };
  
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1026-wifi-mt76-mt7915-disable-SW-ACI-by-default.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1026-wifi-mt76-mt7915-disable-SW-ACI-by-default.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1026-wifi-mt76-mt7915-disable-SW-ACI-by-default.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1026-wifi-mt76-mt7915-disable-SW-ACI-by-default.patch
index e96992e..fc382a9 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1026-wifi-mt76-mt7915-disable-SW-ACI-by-default.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1026-wifi-mt76-mt7915-disable-SW-ACI-by-default.patch
@@ -1,7 +1,7 @@
-From 7f50bd85cb6e13254fa6e72667e1b34599c64f27 Mon Sep 17 00:00:00 2001
+From 252b23b1e979d3b44ca148407d0166c9b618c9e2 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Fri, 24 Feb 2023 16:29:42 +0800
-Subject: [PATCH] wifi: mt76: mt7915: disable SW-ACI by default
+Subject: [PATCH 1026/1052] wifi: mt76: mt7915: disable SW-ACI by default
 
 Support to enable/disable SW-ACI by module parameter "sw_aci_enable".
 SW-ACI feature is disable by default.
@@ -13,7 +13,7 @@
  4 files changed, 29 insertions(+), 9 deletions(-)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 9fa01e9..05076b3 100644
+index 4a5a0155..75042189 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -8,6 +8,10 @@
@@ -39,7 +39,7 @@
  
  	if (phy != &dev->phy) {
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 8e895b3..236f666 100644
+index ca18acfb..7a7b3bac 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -5222,3 +5222,18 @@ int mt7915_mcu_get_edcca(struct mt7915_phy *phy, u8 mode, s8 *value)
@@ -62,7 +62,7 @@
 +				 sizeof(req), NULL);
 +}
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 82d374e..3fa3257 100644
+index 82d374eb..3fa32574 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -801,6 +801,7 @@ int mt7915_vendor_amnt_sta_remove(struct mt7915_phy *phy,
@@ -74,7 +74,7 @@
  int mt7915_mcu_ipi_hist_scan(struct mt7915_phy *phy, void *data, u8 mode, bool wait_resp);
  
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 3e84d75..d932360 100644
+index 3e84d753..d9323603 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3773,16 +3773,12 @@ static int mt7915_show_eeprom_mode(struct seq_file *s, void *data)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1027-wifi-mt76-mt7915-add-muru-user-number-debug-command.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1027-wifi-mt76-mt7915-add-muru-user-number-debug-command.patch
similarity index 83%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1027-wifi-mt76-mt7915-add-muru-user-number-debug-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1027-wifi-mt76-mt7915-add-muru-user-number-debug-command.patch
index b0a287b..0cfc758 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1027-wifi-mt76-mt7915-add-muru-user-number-debug-command.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1027-wifi-mt76-mt7915-add-muru-user-number-debug-command.patch
@@ -1,7 +1,7 @@
-From 37b9de2d5d24fbdb33192977ce5d33d0ad7f2c0a Mon Sep 17 00:00:00 2001
+From ffe8743a0ee8310def4abad0968fee55cf409ea6 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Thu, 27 Apr 2023 15:37:33 +0800
-Subject: [PATCH 1027/1051] wifi: mt76: mt7915: add muru user number debug
+Subject: [PATCH 1027/1052] wifi: mt76: mt7915: add muru user number debug
  command
 
 ---
@@ -11,10 +11,10 @@
  3 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 498674d..24dc022 100644
+index 3fa32574..c745b31d 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -647,6 +647,7 @@ int mt7915_mcu_set_pulse_th(struct mt7915_dev *dev,
+@@ -662,6 +662,7 @@ int mt7915_mcu_set_pulse_th(struct mt7915_dev *dev,
  int mt7915_mcu_set_radar_th(struct mt7915_dev *dev, int index,
  			    const struct mt7915_dfs_pattern *pattern);
  int mt7915_mcu_set_muru_ctrl(struct mt7915_dev *dev, u32 cmd, u32 val);
@@ -23,10 +23,10 @@
  int mt7915_mcu_apply_tx_dpd(struct mt7915_phy *phy);
  int mt7915_mcu_get_chan_mib_info(struct mt7915_phy *phy, bool chan_switch);
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 9a26f7f..432d750 100644
+index df08704b..6446439f 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -46,6 +46,8 @@ static const struct nla_policy
+@@ -47,6 +47,8 @@ static const struct nla_policy
  mu_ctrl_policy[NUM_MTK_VENDOR_ATTRS_MU_CTRL] = {
  	[MTK_VENDOR_ATTR_MU_CTRL_ONOFF] = {.type = NLA_U8 },
  	[MTK_VENDOR_ATTR_MU_CTRL_DUMP] = {.type = NLA_U8 },
@@ -35,7 +35,7 @@
  };
  
  static const struct nla_policy
-@@ -1053,9 +1055,10 @@ static int mt7915_vendor_mu_ctrl(struct wiphy *wiphy,
+@@ -1189,9 +1191,10 @@ static int mt7915_vendor_mu_ctrl(struct wiphy *wiphy,
  				  int data_len)
  {
  	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
@@ -47,7 +47,7 @@
  	u32 val32 = 0;
  
  	err = nla_parse(tb, MTK_VENDOR_ATTR_MU_CTRL_MAX, data, data_len,
-@@ -1069,6 +1072,16 @@ static int mt7915_vendor_mu_ctrl(struct wiphy *wiphy,
+@@ -1205,6 +1208,16 @@ static int mt7915_vendor_mu_ctrl(struct wiphy *wiphy,
  			 FIELD_PREP(RATE_CFG_VAL, val8);
  		ieee80211_iterate_active_interfaces_atomic(hw, IEEE80211_IFACE_ITER_RESUME_ALL,
  			mt7915_set_wireless_vif, &val32);
@@ -65,7 +65,7 @@
  
  	return 0;
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index bd1c617..03d1660 100644
+index 5b8d99bf..11ccd0d8 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -103,6 +103,8 @@ enum mtk_vendor_attr_mu_ctrl {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1028-wifi-mt76-mt7915-add-debugfs-for-fw-coredump.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1028-wifi-mt76-mt7915-add-debugfs-for-fw-coredump.patch
similarity index 93%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1028-wifi-mt76-mt7915-add-debugfs-for-fw-coredump.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1028-wifi-mt76-mt7915-add-debugfs-for-fw-coredump.patch
index a2d4af1..650f7de 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1028-wifi-mt76-mt7915-add-debugfs-for-fw-coredump.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1028-wifi-mt76-mt7915-add-debugfs-for-fw-coredump.patch
@@ -1,7 +1,7 @@
-From ef06e880955373d91da964fe8bda86e12277ec55 Mon Sep 17 00:00:00 2001
+From 15cd113a03288b74f6486c898378d61b2204b09e Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Mon, 22 May 2023 15:30:21 +0800
-Subject: [PATCH 1028/1051] wifi: mt76: mt7915: add debugfs for fw coredump.
+Subject: [PATCH 1028/1052] wifi: mt76: mt7915: add debugfs for fw coredump.
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
 ---
@@ -12,7 +12,7 @@
  4 files changed, 58 insertions(+), 9 deletions(-)
 
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index fa1d2ac..3044557 100644
+index 3830a735..06c62dd3 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -82,8 +82,10 @@ mt7915_sys_recovery_set(struct file *file, const char __user *user_buf,
@@ -67,7 +67,7 @@
  	/* SER statistics */
  	desc += scnprintf(buff + desc, bufsz - desc,
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index e14b3fd..35e97f8 100644
+index e14b3fdd..35e97f88 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1687,10 +1687,34 @@ void mt7915_mac_dump_work(struct work_struct *work)
@@ -117,7 +117,7 @@
  	}
  
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 6ebcce0..035ad97 100644
+index 6ebcce0d..035ad97d 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -760,8 +760,12 @@ enum {
@@ -135,7 +135,7 @@
  	SER_ENABLE = 2,
  	SER_RECOVER
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 24dc022..6317051 100644
+index c745b31d..ef51d6e2 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -91,6 +91,13 @@ struct mt7915_sta;
@@ -152,7 +152,7 @@
  enum mt7915_txq_id {
  	MT7915_TXQ_FWDL = 16,
  	MT7915_TXQ_MCU_WM,
-@@ -389,6 +396,7 @@ struct mt7915_dev {
+@@ -404,6 +411,7 @@ struct mt7915_dev {
  
  	/* protects coredump data */
  	struct mutex dump_mutex;
@@ -160,7 +160,7 @@
  #ifdef CONFIG_DEV_COREDUMP
  	struct {
  		struct mt7915_crash_data *crash_data[__MT76_RAM_TYPE_MAX];
-@@ -585,6 +593,7 @@ int mt7915_txbf_init(struct mt7915_dev *dev);
+@@ -600,6 +608,7 @@ int mt7915_txbf_init(struct mt7915_dev *dev);
  void mt7915_init_txpower(struct mt7915_phy *phy);
  int mt7915_init_vif(struct mt7915_phy *phy, struct ieee80211_vif *vif, bool bf_en);
  void mt7915_reset(struct mt7915_dev *dev);
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1029-wifi-mt76-mt7915-remove-BW160-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1029-wifi-mt76-mt7915-remove-BW160-support.patch
similarity index 81%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1029-wifi-mt76-mt7915-remove-BW160-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1029-wifi-mt76-mt7915-remove-BW160-support.patch
index 81d26e8..ab2f5d5 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1029-wifi-mt76-mt7915-remove-BW160-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1029-wifi-mt76-mt7915-remove-BW160-support.patch
@@ -1,7 +1,7 @@
-From 7c0b8498964ddc1708cd5fd949e70d70d7cc7207 Mon Sep 17 00:00:00 2001
+From 1ffedbe219a388f3b76a717cbf2d42e6ba9b25f2 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Wed, 24 May 2023 22:35:54 +0800
-Subject: [PATCH 1029/1051] wifi: mt76: mt7915: remove BW160 support
+Subject: [PATCH 1029/1052] wifi: mt76: mt7915: remove BW160 support
 
 Remove BW160 capability in mt7915.
 ---
@@ -9,10 +9,10 @@
  1 file changed, 6 insertions(+), 20 deletions(-)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index f548d09..20d6efd 100644
+index a9cb496b..a77078f7 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -440,11 +440,6 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+@@ -441,11 +441,6 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
  			vht_cap->cap |=
  				IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
  				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;
@@ -24,7 +24,7 @@
  		} else {
  			phy->mt76->sband_5g.sband.ht_cap.ampdu_density =
  				IEEE80211_HT_MPDU_DENSITY_2;
-@@ -865,13 +860,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy,
+@@ -873,13 +868,9 @@ mt7915_set_stream_he_txbf_caps(struct mt7915_phy *phy,
  	int sts = hweight8(phy->mt76->chainmask);
  	u8 c, sts_160 = sts;
  
@@ -41,7 +41,7 @@
  
  #ifdef CONFIG_MAC80211_MESH
  	if (vif == NL80211_IFTYPE_MESH_POINT)
-@@ -955,15 +946,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
+@@ -963,15 +954,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
  	int i, idx = 0, nss = hweight8(phy->mt76->antenna_mask);
  	u16 mcs_map = 0;
  	u16 mcs_map_160 = 0;
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1030-wifi-mt76-mt7915-add-txpower-info-dump-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1030-wifi-mt76-mt7915-add-txpower-info-dump-support.patch
similarity index 93%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1030-wifi-mt76-mt7915-add-txpower-info-dump-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1030-wifi-mt76-mt7915-add-txpower-info-dump-support.patch
index b0f9ac0..c7b206b 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1030-wifi-mt76-mt7915-add-txpower-info-dump-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1030-wifi-mt76-mt7915-add-txpower-info-dump-support.patch
@@ -1,7 +1,7 @@
-From dc97f22df64689fe6d5cf9e410437c8d9510a41c Mon Sep 17 00:00:00 2001
+From ac55beffc7c153e47a63dd889a80f90656afa5a4 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Tue, 11 Jul 2023 17:06:04 +0800
-Subject: [PATCH 1030/1051] wifi: mt76: mt7915: add txpower info dump support
+Subject: [PATCH 1030/1052] wifi: mt76: mt7915: add txpower info dump support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
@@ -11,7 +11,7 @@
  3 files changed, 91 insertions(+), 1 deletion(-)
 
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 3044557..24e88f7 100644
+index 06c62dd3..223f9a37 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -1259,6 +1259,91 @@ mt7915_txpower_path_show(struct seq_file *file, void *data)
@@ -106,7 +106,7 @@
  static int
  mt7915_twt_stats(struct seq_file *s, void *data)
  {
-@@ -1388,6 +1473,8 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
+@@ -1433,6 +1518,8 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
  			    &mt7915_txpower_fops);
  	debugfs_create_file("txpower_path", 0400, dir, phy,
  			    &mt7915_txpower_path_fops);
@@ -116,7 +116,7 @@
  				    mt7915_twt_stats);
  	debugfs_create_file("rf_regval", 0600, dir, dev, &fops_rf_regval);
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 7039933..92c0a1e 100644
+index 7a7b3bac..34d36e50 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -3624,6 +3624,8 @@ int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len,
@@ -129,7 +129,7 @@
  
  	dev_kfree_skb(skb);
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 035ad97..3089fb6 100644
+index 035ad97d..3089fb64 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -525,7 +525,8 @@ enum {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-report-tx-and-rx-byte-to-tpt_led-wh.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-report-tx-and-rx-byte-to-tpt_led-wh.patch
similarity index 91%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-report-tx-and-rx-byte-to-tpt_led-wh.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-report-tx-and-rx-byte-to-tpt_led-wh.patch
index ac73e2d..2f9f4d1 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-report-tx-and-rx-byte-to-tpt_led-wh.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1031-wifi-mt76-mt7915-report-tx-and-rx-byte-to-tpt_led-wh.patch
@@ -1,7 +1,7 @@
-From d2be9fd8f4889bfde955ab9aeb865d4359e0edd5 Mon Sep 17 00:00:00 2001
+From 693f54f4538631b84be41befd324f642182d37ca Mon Sep 17 00:00:00 2001
 From: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
 Date: Fri, 23 Jun 2023 06:06:21 +0800
-Subject: [PATCH 1031/1051] wifi: mt76: mt7915: report tx and rx byte to
+Subject: [PATCH 1031/1052] wifi: mt76: mt7915: report tx and rx byte to
  tpt_led when wed is enabled
 
 Signed-off-by: Yi-Chia Hsieh <yi-chia.hsieh@mediatek.com>
@@ -11,7 +11,7 @@
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index 170ef36..6eeea97 100644
+index 170ef367..6eeea971 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -605,9 +605,15 @@ bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,
@@ -42,7 +42,7 @@
  			sband = &mphy->sband_5g.sband;
  		else if (mphy->chandef.chan->band == NL80211_BAND_6GHZ)
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index ddf1b72..437a9b0 100644
+index ed15d711..b1b219ce 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -588,6 +588,7 @@ static void mt7915_mmio_wed_update_rx_stats(struct mtk_wed_device *wed,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1032-wifi-mt76-mt7915-Establish-BA-in-VO-queue.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1032-wifi-mt76-mt7915-Establish-BA-in-VO-queue.patch
similarity index 77%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1032-wifi-mt76-mt7915-Establish-BA-in-VO-queue.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1032-wifi-mt76-mt7915-Establish-BA-in-VO-queue.patch
index 9b232bf..a62749d 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1032-wifi-mt76-mt7915-Establish-BA-in-VO-queue.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1032-wifi-mt76-mt7915-Establish-BA-in-VO-queue.patch
@@ -1,14 +1,14 @@
-From 372460c5ed7a903c5cc5f814d588df5811df850e Mon Sep 17 00:00:00 2001
+From fcfa851c3dd6782c382dc1890f2623fdc0858f73 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <meichia.chiu@mediatek.com>
 Date: Tue, 8 Aug 2023 11:20:58 +0800
-Subject: [PATCH 1032/1051] wifi: mt76: mt7915: Establish BA in VO queue
+Subject: [PATCH 1032/1052] wifi: mt76: mt7915: Establish BA in VO queue
 
 ---
  mt76_connac_mac.c | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index 6eeea97..c23d266 100644
+index 6eeea971..c23d266e 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -1123,8 +1123,6 @@ void mt76_connac2_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1033-wifi-mt76-mt7915-Disable-RegDB-when-enable-single-sk.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1033-wifi-mt76-mt7915-Disable-RegDB-when-enable-single-sk.patch
similarity index 93%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1033-wifi-mt76-mt7915-Disable-RegDB-when-enable-single-sk.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1033-wifi-mt76-mt7915-Disable-RegDB-when-enable-single-sk.patch
index dc975a6..4ca8bff 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1033-wifi-mt76-mt7915-Disable-RegDB-when-enable-single-sk.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1033-wifi-mt76-mt7915-Disable-RegDB-when-enable-single-sk.patch
@@ -1,7 +1,7 @@
-From 1de98ecb4505e3f99759caf4e9df9e263dfa403a Mon Sep 17 00:00:00 2001
+From 6eb114c04f79a4e1642a6743e9895cb8038a4630 Mon Sep 17 00:00:00 2001
 From: "Allen.Ye" <allen.ye@mediatek.com>
 Date: Fri, 11 Aug 2023 16:46:53 +0800
-Subject: [PATCH 1033/1051] wifi: mt76: mt7915: Disable RegDB when enable
+Subject: [PATCH 1033/1052] wifi: mt76: mt7915: Disable RegDB when enable
  single sku
 
 ---
@@ -11,7 +11,7 @@
  3 files changed, 57 insertions(+), 11 deletions(-)
 
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 24e88f7..502b493 100644
+index 223f9a37..2c1e1bea 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -1020,10 +1020,16 @@ mt7915_rate_txpower_get(struct file *file, char __user *user_buf,
@@ -40,15 +40,15 @@
 -	      MT_WF_PHY_TPC_CTRL_STAT_MT7916(band);
 +	reg = is_mt7915(&dev->mt76) ? MT_WF_IRPI_TPC_CTRL_STAT(band) :
 +	      MT_WF_IRPI_TPC_CTRL_STAT_MT7916(band);
- 
--	len += scnprintf(buf + len, sz - len, "\nTx power (bbp)  : %6ld\n",
--			 mt76_get_field(dev, reg, MT_WF_PHY_TPC_POWER));
++
 +	len += scnprintf(buf + len, sz - len, "\nTx power (bbp)  : %6ld [0.5 dBm]\n",
 +			 mt76_get_field(dev, reg, MT_WF_IRPI_TPC_POWER));
 +
 +	len += scnprintf(buf + len, sz - len, "RegDB maximum power:\t%d [dBm]\n",
 +			 chan->max_reg_power);
-+
+ 
+-	len += scnprintf(buf + len, sz - len, "\nTx power (bbp)  : %6ld\n",
+-			 mt76_get_field(dev, reg, MT_WF_PHY_TPC_POWER));
 +	if (chan->band == NL80211_BAND_2GHZ)
 +		sband = phy->mt76->sband_2g.sband;
 +	else if (chan->band == NL80211_BAND_5GHZ)
@@ -103,10 +103,10 @@
  	return ret;
  }
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 20d6efd..4fa48fb 100644
+index a77078f7..6f616b54 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -283,9 +283,11 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
+@@ -284,9 +284,11 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
  	int nss_delta = mt76_tx_power_nss_delta(n_chains);
  	int pwr_delta = mt7915_eeprom_get_power_delta(dev, sband->band);
  	struct mt76_power_limits limits;
@@ -118,7 +118,7 @@
  	for (i = 0; i < sband->n_channels; i++) {
  		struct ieee80211_channel *chan = &sband->channels[i];
  		u32 target_power = 0;
-@@ -309,8 +311,13 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
+@@ -310,8 +312,13 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
  
  		target_power += nss_delta;
  		target_power = DIV_ROUND_UP(target_power, 2);
@@ -135,7 +135,7 @@
  	}
  }
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index 4d05e39..ca355d1 100644
+index 4d05e391..ca355d14 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -1215,6 +1215,10 @@ enum offs_rev {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1034-wifi-mt76-mt7915-enable-the-mac80211-hw-bmc-ps-buffe.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1034-wifi-mt76-mt7915-enable-the-mac80211-hw-bmc-ps-buffe.patch
similarity index 70%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1034-wifi-mt76-mt7915-enable-the-mac80211-hw-bmc-ps-buffe.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1034-wifi-mt76-mt7915-enable-the-mac80211-hw-bmc-ps-buffe.patch
index 92a60ce..89f875e 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1034-wifi-mt76-mt7915-enable-the-mac80211-hw-bmc-ps-buffe.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1034-wifi-mt76-mt7915-enable-the-mac80211-hw-bmc-ps-buffe.patch
@@ -1,7 +1,7 @@
-From fd4211f53ab7973c1875881dcdaa12e252b95670 Mon Sep 17 00:00:00 2001
+From 18fd1219383a2d2f2b0881d87ca8a1552e273bf1 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Thu, 24 Aug 2023 03:01:27 +0800
-Subject: [PATCH 1034/1051] wifi: mt76: mt7915: enable the mac80211 hw bmc ps
+Subject: [PATCH 1034/1052] wifi: mt76: mt7915: enable the mac80211 hw bmc ps
  buffer function.
 
 ---
@@ -9,10 +9,10 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 4fa48fb..0f8a772 100644
+index 6f616b54..c4685f21 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -413,6 +413,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+@@ -414,6 +414,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
  	ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD);
  	ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID);
  	ieee80211_hw_set(hw, WANT_MONITOR_VIF);
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1035-wifi-mt76-update-debugfs-knob-for-tx-tokens.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1035-wifi-mt76-update-debugfs-knob-for-tx-tokens.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1035-wifi-mt76-update-debugfs-knob-for-tx-tokens.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1035-wifi-mt76-update-debugfs-knob-for-tx-tokens.patch
index cd4a4bb..b41c81d 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1035-wifi-mt76-update-debugfs-knob-for-tx-tokens.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1035-wifi-mt76-update-debugfs-knob-for-tx-tokens.patch
@@ -1,7 +1,7 @@
-From cf2a6fb7145d4083bd06558fcad669f91517b6ad Mon Sep 17 00:00:00 2001
+From c324616943e4a51d5d288a26bdbb330be11d2d8f Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Thu, 24 Aug 2023 03:01:27 +0800
-Subject: [PATCH 1035/1051] wifi: mt76: update debugfs knob for tx tokens
+Subject: [PATCH 1035/1052] wifi: mt76: update debugfs knob for tx tokens
 
 1. dump token pending time
 2. dump per-band token counts
@@ -14,7 +14,7 @@
  3 files changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 54f805e..cff22f5 100644
+index 580320fd..16b76b48 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -403,6 +403,7 @@ struct mt76_txwi_cache {
@@ -26,7 +26,7 @@
  	union {
  		struct sk_buff *skb;
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 35e97f8..a731446 100644
+index 35e97f88..a7314465 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -811,6 +811,8 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -39,7 +39,7 @@
  	mt7915_mac_write_txwi(mdev, txwi_ptr, tx_info->skb, wcid, pid, key,
  			      qid, 0);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index ad7abda..5ce2b93 100644
+index d9323603..2cc0b2d8 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -2203,17 +2203,31 @@ static int mt7915_mibinfo_band1(struct seq_file *s, void *data)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1036-wifi-mt76-mt7915-support-enable-disable-spatial-reus.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1036-wifi-mt76-mt7915-support-enable-disable-spatial-reus.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1036-wifi-mt76-mt7915-support-enable-disable-spatial-reus.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1036-wifi-mt76-mt7915-support-enable-disable-spatial-reus.patch
index e9f3b10..98ae91e 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1036-wifi-mt76-mt7915-support-enable-disable-spatial-reus.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1036-wifi-mt76-mt7915-support-enable-disable-spatial-reus.patch
@@ -1,7 +1,7 @@
-From 93a4a8d162937bd5c49aac52d158fe8bda71731a Mon Sep 17 00:00:00 2001
+From 8e5290c521da92f931b169e1b2dccc7125e17253 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Tue, 5 Sep 2023 20:17:19 +0800
-Subject: [PATCH 1036/1051] wifi: mt76: mt7915: support enable/disable spatial
+Subject: [PATCH 1036/1052] wifi: mt76: mt7915: support enable/disable spatial
  reuse through debugfs
 
 Signed-off-by: Howard Hsu <howard-yh.hsu@mediatek.com>
@@ -12,7 +12,7 @@
  3 files changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 92c0a1e..ef9f0ce 100644
+index 34d36e50..40d94c4f 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -3756,8 +3756,7 @@ int mt7915_mcu_set_txbf(struct mt7915_dev *dev, u8 action)
@@ -26,10 +26,10 @@
  	struct mt7915_dev *dev = phy->dev;
  	struct mt7915_mcu_sr_ctrl req = {
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 6317051..3ec65a7 100644
+index ef51d6e2..bc0f313c 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -798,6 +798,7 @@ int mt7915_mcu_get_edcca(struct mt7915_phy *phy, u8 mode, s8 *value);
+@@ -814,6 +814,7 @@ int mt7915_mcu_get_edcca(struct mt7915_phy *phy, u8 mode, s8 *value);
  int mt7915_mcu_sw_aci_set(struct mt7915_dev *dev, bool val);
  int mt7915_mcu_ipi_hist_ctrl(struct mt7915_phy *phy, void *data, u8 cmd, bool wait_resp);
  int mt7915_mcu_ipi_hist_scan(struct mt7915_phy *phy, void *data, u8 mode, bool wait_resp);
@@ -38,7 +38,7 @@
  #ifdef MTK_DEBUG
  int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 5ce2b93..b653c34 100644
+index 2cc0b2d8..c00184f8 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3799,6 +3799,17 @@ mt7915_sw_aci_set(void *data, u64 val)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1037-wifi-mt76-mt7915-add-debug-log-for-SER-flow.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1037-wifi-mt76-mt7915-add-debug-log-for-SER-flow.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1037-wifi-mt76-mt7915-add-debug-log-for-SER-flow.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1037-wifi-mt76-mt7915-add-debug-log-for-SER-flow.patch
index 966e47d..d3fd14d 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1037-wifi-mt76-mt7915-add-debug-log-for-SER-flow.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1037-wifi-mt76-mt7915-add-debug-log-for-SER-flow.patch
@@ -1,7 +1,7 @@
-From 664596920de78c1aa9d1c3dc0e07018ca5c7d43d Mon Sep 17 00:00:00 2001
+From 50046dd2dad794942f0f28fda6ede3b90261e0be Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Mon, 11 Sep 2023 17:11:24 +0800
-Subject: [PATCH 1037/1051] wifi: mt76: mt7915: add debug log for SER flow.
+Subject: [PATCH 1037/1052] wifi: mt76: mt7915: add debug log for SER flow.
 
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
 ---
@@ -9,7 +9,7 @@
  1 file changed, 9 insertions(+)
 
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index a731446..c421447 100644
+index a7314465..c421447c 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1531,6 +1531,9 @@ void mt7915_mac_reset_work(struct work_struct *work)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1038-wifi-mt76-mt7915-add-debuffs-knob-for-protect-thresh.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1038-wifi-mt76-mt7915-add-debuffs-knob-for-protect-thresh.patch
similarity index 87%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1038-wifi-mt76-mt7915-add-debuffs-knob-for-protect-thresh.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1038-wifi-mt76-mt7915-add-debuffs-knob-for-protect-thresh.patch
index b38bc29..a367ad8 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1038-wifi-mt76-mt7915-add-debuffs-knob-for-protect-thresh.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1038-wifi-mt76-mt7915-add-debuffs-knob-for-protect-thresh.patch
@@ -1,7 +1,7 @@
-From bbcd1a6d3d84c1cb1a82fe996bf825c11878289c Mon Sep 17 00:00:00 2001
+From 5fa70ee3f31733b9ddee67fdc78fe637df251aca Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 2 Oct 2023 14:00:13 +0800
-Subject: [PATCH 1038/1051] wifi: mt76: mt7915: add debuffs knob for protect
+Subject: [PATCH 1038/1052] wifi: mt76: mt7915: add debuffs knob for protect
  threshold
 
 ---
@@ -10,10 +10,10 @@
  2 files changed, 12 insertions(+)
 
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 3ec65a7..3dc99f8 100644
+index bc0f313c..183d59da 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -778,6 +778,7 @@ void mt7915_mcu_set_rfeature_starec(void *data, struct mt7915_dev *dev,
+@@ -792,6 +792,7 @@ void mt7915_mcu_set_rfeature_starec(void *data, struct mt7915_dev *dev,
  		       struct ieee80211_vif *vif, struct ieee80211_sta *sta);
  int mt7915_mcu_set_rfeature_trig_type(struct mt7915_phy *phy, u8 enable, u8 trig_type);
  int mt7915_mcu_set_mu_dl_ack_policy(struct mt7915_phy *phy, u8 policy_num);
@@ -22,7 +22,7 @@
  void mt7915_mcu_set_nusers_ofdma(struct mt7915_phy *phy, u8 type, u8 ofdma_user_cnt);
  void mt7915_mcu_set_mimo(struct mt7915_phy *phy, u8 direction);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index b653c34..dad5ed7 100644
+index c00184f8..c8efd266 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -2852,6 +2852,16 @@ static int mt7915_sta_tx_amsdu_set(void *data, u64 tx_amsdu)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1039-wifi-mt76-mt7915-add-mt7981-efuse-variants-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1039-wifi-mt76-mt7915-add-mt7981-efuse-variants-support.patch
similarity index 85%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1039-wifi-mt76-mt7915-add-mt7981-efuse-variants-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1039-wifi-mt76-mt7915-add-mt7981-efuse-variants-support.patch
index 2260e5f..39612b0 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1039-wifi-mt76-mt7915-add-mt7981-efuse-variants-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1039-wifi-mt76-mt7915-add-mt7981-efuse-variants-support.patch
@@ -1,7 +1,7 @@
-From 51410d3e134142548c1432c0ea5c07635d8646a5 Mon Sep 17 00:00:00 2001
+From 90dfcdd20e564dc3b82342141dfd6917899b7b66 Mon Sep 17 00:00:00 2001
 From: "Henry.Yen" <henry.yen@mediatek.com>
 Date: Mon, 11 Dec 2023 16:01:55 +0800
-Subject: [PATCH 1039/1051] wifi: mt76: mt7915 add mt7981 efuse variants
+Subject: [PATCH 1039/1052] wifi: mt76: mt7915 add mt7981 efuse variants
  support
 
 ---
@@ -10,7 +10,7 @@
  2 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/mt7915/eeprom.c b/mt7915/eeprom.c
-index 6133c20..df5e396 100644
+index 6133c200..df5e396c 100644
 --- a/mt7915/eeprom.c
 +++ b/mt7915/eeprom.c
 @@ -193,6 +193,21 @@ static int mt7915_eeprom_load(struct mt7915_dev *dev)
@@ -50,10 +50,10 @@
  	mt7915_eeprom_parse_band_config(phy);
  
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 3dc99f8..3170aca 100644
+index 183d59da..c8f9ed52 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -409,6 +409,7 @@ struct mt7915_dev {
+@@ -424,6 +424,7 @@ struct mt7915_dev {
  
  	u32 hw_pattern;
  
@@ -61,7 +61,7 @@
  	bool dbdc_support;
  	bool flash_mode;
  	bool bin_file_mode;
-@@ -684,7 +685,11 @@ void mt7915_tm_rf_test_event(struct mt7915_dev *dev, struct sk_buff *skb);
+@@ -698,7 +699,11 @@ void mt7915_tm_rf_test_event(struct mt7915_dev *dev, struct sk_buff *skb);
  
  static inline u16 mt7915_wtbl_size(struct mt7915_dev *dev)
  {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1040-wifi-mt76-mt7915-support-scs-feature.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1040-wifi-mt76-mt7915-support-scs-feature.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1040-wifi-mt76-mt7915-support-scs-feature.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1040-wifi-mt76-mt7915-support-scs-feature.patch
index e826d19..0f39a4a 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1040-wifi-mt76-mt7915-support-scs-feature.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1040-wifi-mt76-mt7915-support-scs-feature.patch
@@ -1,7 +1,7 @@
-From 28300199dbd301df08b570d527aeb76adac50343 Mon Sep 17 00:00:00 2001
+From 5ba9ebc9e86610960d798ff1103350d2d3453a90 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Wed, 6 Dec 2023 08:53:03 +0800
-Subject: [PATCH 1040/1041] wifi: mt76: mt7915: support scs feature
+Subject: [PATCH 1040/1052] wifi: mt76: mt7915: support scs feature
 
 Add support scs feature for connac2 codebase. This commit includes three
 parts.
@@ -29,7 +29,7 @@
  9 files changed, 188 insertions(+)
 
 diff --git a/mt76.h b/mt76.h
-index 86e4a60..8450d3b 100644
+index 16b76b48..43f3c282 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -311,6 +311,7 @@ struct mt76_sta_stats {
@@ -49,7 +49,7 @@
  
  enum mt76_wcid_flags {
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index dc2a47d..8b7fe87 100644
+index 49c3f1aa..febe3ed4 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1238,6 +1238,7 @@ enum {
@@ -61,10 +61,10 @@
  	MCU_EXT_CMD_FW_DBG_CTRL = 0x95,
  	MCU_EXT_CMD_OFFCH_SCAN_CTRL = 0x9a,
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 4dbb84a..ec61911 100644
+index c4685f21..a26e0d69 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -1219,6 +1219,7 @@ int mt7915_register_device(struct mt7915_dev *dev)
+@@ -1222,6 +1222,7 @@ int mt7915_register_device(struct mt7915_dev *dev)
  	spin_lock_init(&dev->phy.stats_lock);
  	INIT_WORK(&dev->rc_work, mt7915_mac_sta_rc_work);
  	INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7915_mac_work);
@@ -73,7 +73,7 @@
  	INIT_LIST_HEAD(&dev->twt_list);
  
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index c421447..fb98940 100644
+index c421447c..fb989405 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1463,6 +1463,8 @@ mt7915_mac_full_reset(struct mt7915_dev *dev)
@@ -116,7 +116,7 @@
  		 wiphy_name(dev->mt76.hw->wiphy));
  }
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 05076b3..ba009e6 100644
+index 75042189..04301300 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -89,12 +89,24 @@ int mt7915_run(struct ieee80211_hw *hw)
@@ -153,7 +153,7 @@
  		mt7915_mcu_set_mac(dev, dev->phy.mt76->band_idx, false, false);
  	}
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 052ec99..297ded7 100644
+index 40d94c4f..fcbe4da4 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -5238,3 +5238,121 @@ int mt7915_mcu_sw_aci_set(struct mt7915_dev *dev, bool val)
@@ -279,7 +279,7 @@
 +		ieee80211_queue_delayed_work(mt76_hw(dev), &dev->scs_work, HZ);
 +}
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 3089fb6..742a785 100644
+index 3089fb64..742a7855 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -1200,4 +1200,8 @@ struct mt7915_mcu_edcca_info {
@@ -292,7 +292,7 @@
 +};
  #endif
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index c8f9ed5..6b27be9 100644
+index c8f9ed52..6b27be9c 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -283,6 +283,15 @@ struct mt7915_air_monitor_ctrl {
@@ -338,7 +338,7 @@
  #ifdef MTK_DEBUG
  int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index c8efd26..e60dc85 100644
+index c8efd266..e60dc850 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3820,6 +3820,29 @@ mt7915_sr_enable_set(void *data, u64 val)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1041-wifi-mt76-mt7915-support-thermal-recal-debug-commnad.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1041-wifi-mt76-mt7915-support-thermal-recal-debug-commnad.patch
similarity index 92%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1041-wifi-mt76-mt7915-support-thermal-recal-debug-commnad.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1041-wifi-mt76-mt7915-support-thermal-recal-debug-commnad.patch
index 4576a2c..51ad6bc 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1041-wifi-mt76-mt7915-support-thermal-recal-debug-commnad.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1041-wifi-mt76-mt7915-support-thermal-recal-debug-commnad.patch
@@ -1,7 +1,7 @@
-From 9fd80f6b724ba3f7272da8856e3b3d07d04dadb8 Mon Sep 17 00:00:00 2001
+From 71385726a0af02c6cb650a6be60511e6f0f1b3a4 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Thu, 21 Dec 2023 20:35:36 +0800
-Subject: [PATCH 1041/1041] wifi: mt76: mt7915: support thermal recal debug
+Subject: [PATCH 1041/1052] wifi: mt76: mt7915: support thermal recal debug
  commnad
 
 Add thermal recal debug command:
@@ -21,7 +21,7 @@
  4 files changed, 35 insertions(+)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 8b7fe87..c34c6e6 100644
+index febe3ed4..8a0f5bea 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
 @@ -1234,6 +1234,7 @@ enum {
@@ -33,7 +33,7 @@
  	MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d,
  	MCU_EXT_CMD_MWDS_SUPPORT = 0x80,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 297ded7..b66e5ea 100644
+index fcbe4da4..2b653bfb 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -5356,3 +5356,18 @@ void mt7915_mcu_scs_sta_poll(struct work_struct *work)
@@ -56,7 +56,7 @@
 +				 sizeof(req), true);
 +}
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 6b27be9..496ccd9 100644
+index 6b27be9c..496ccd94 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -835,6 +835,7 @@ int mt7915_mcu_ipi_hist_scan(struct mt7915_phy *phy, void *data, u8 mode, bool w
@@ -68,7 +68,7 @@
  #ifdef MTK_DEBUG
  int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index e60dc85..0677495 100644
+index e60dc850..0677495c 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3843,6 +3843,22 @@ mt7915_scs_enable_set(void *data, u64 val)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1042-wifi-mt76-mt7915-Add-support-for-lpi-and-duplicate-m.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1042-wifi-mt76-mt7915-Add-support-for-lpi-and-duplicate-m.patch
similarity index 93%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1042-wifi-mt76-mt7915-Add-support-for-lpi-and-duplicate-m.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1042-wifi-mt76-mt7915-Add-support-for-lpi-and-duplicate-m.patch
index 2508bd1..4dbc453 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1042-wifi-mt76-mt7915-Add-support-for-lpi-and-duplicate-m.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1042-wifi-mt76-mt7915-Add-support-for-lpi-and-duplicate-m.patch
@@ -1,7 +1,7 @@
-From 15b2679217535569b2c27dad231ad2c38857a3d2 Mon Sep 17 00:00:00 2001
+From 45dbb4f20ca056bd56f8c723a10d0f5662d92f75 Mon Sep 17 00:00:00 2001
 From: Allen Ye <allen.ye@mediatek.com>
 Date: Fri, 15 Dec 2023 14:03:11 +0800
-Subject: [PATCH 1042/1051] wifi: mt76: mt7915: Add support for lpi and
+Subject: [PATCH 1042/1052] wifi: mt76: mt7915: Add support for lpi and
  duplicate mode
 
 Add support lpi and duplicate mode.
@@ -31,7 +31,7 @@
  12 files changed, 210 insertions(+), 17 deletions(-)
 
 diff --git a/eeprom.c b/eeprom.c
-index aa33e7b..261d65a 100644
+index aa33e7b5..261d65ad 100644
 --- a/eeprom.c
 +++ b/eeprom.c
 @@ -224,8 +224,9 @@ static bool mt76_string_prop_find(struct property *prop, const char *str)
@@ -95,7 +95,7 @@
  		return target_power;
  
 diff --git a/mt76.h b/mt76.h
-index 7ffba7d..a7a8ece 100644
+index 43f3c282..a18b3e57 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -853,6 +853,9 @@ struct mt76_phy {
@@ -118,7 +118,7 @@
  mt76_find_channel_node(struct device_node *np, struct ieee80211_channel *chan);
  
 diff --git a/mt76_connac2_mac.h b/mt76_connac2_mac.h
-index eb47653..49ba39f 100644
+index eb476536..49ba39ff 100644
 --- a/mt76_connac2_mac.h
 +++ b/mt76_connac2_mac.h
 @@ -355,6 +355,13 @@ enum tx_port_idx {
@@ -136,7 +136,7 @@
  	MT_TX_FRAG_NONE,
  	MT_TX_FRAG_FIRST,
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index c23d266..d170815 100644
+index c23d266e..d1708152 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -572,7 +572,8 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi,
@@ -161,10 +161,10 @@
  
  		txwi[7] &= ~cpu_to_le32(MT_TXD7_HW_AMSDU);
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index e445046..4f87e25 100644
+index 8a0f5bea..3148526a 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1258,6 +1258,7 @@ enum {
+@@ -1260,6 +1260,7 @@ enum {
  	MCU_EXT_CMD_SWLNA_ACI_CTRL = 0xc0,
  	MCU_EXT_CMD_CSI_CTRL = 0xc2,
  	MCU_EXT_CMD_IPI_HIST_SCAN = 0xc5,
@@ -173,7 +173,7 @@
  
  enum {
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 502b493..b2a4ff4 100644
+index 2c1e1bea..f031b54c 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -1297,7 +1297,6 @@ mt7915_txpower_info_show(struct seq_file *file, void *data)
@@ -194,10 +194,10 @@
  
  out:
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 2196d5f..9932266 100644
+index a26e0d69..e8a6fcda 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -287,7 +287,7 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
+@@ -288,7 +288,7 @@ static void __mt7915_init_txpower(struct mt7915_phy *phy,
  
  	phy->sku_limit_en = true;
  	phy->sku_path_en = true;
@@ -206,7 +206,7 @@
  	for (i = 0; i < sband->n_channels; i++) {
  		struct ieee80211_channel *chan = &sband->channels[i];
  		u32 target_power = 0;
-@@ -331,8 +331,10 @@ void mt7915_init_txpower(struct mt7915_phy *phy)
+@@ -332,8 +332,10 @@ void mt7915_init_txpower(struct mt7915_phy *phy)
  		__mt7915_init_txpower(phy, &phy->mt76->sband_2g.sband);
  	if (phy->mt76->cap.has_5ghz)
  		__mt7915_init_txpower(phy, &phy->mt76->sband_5g.sband);
@@ -219,7 +219,7 @@
  
  static void
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 87409a4..196cc33 100644
+index 2b653bfb..0fba0a6d 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -1522,7 +1522,8 @@ mt7915_mcu_set_spe_idx(struct mt7915_dev *dev, struct ieee80211_vif *vif,
@@ -355,10 +355,10 @@
  			      u8 en)
  {
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 2981e5a..d524fbf 100644
+index 496ccd94..74008d4f 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -810,6 +810,7 @@ int mt7915_mcu_set_csi(struct mt7915_phy *phy, u8 mode,
+@@ -826,6 +826,7 @@ void mt7915_csi_mac_filter_clear(struct mt7915_phy *phy);
  void mt7915_vendor_amnt_fill_rx(struct mt7915_phy *phy, struct sk_buff *skb);
  int mt7915_vendor_amnt_sta_remove(struct mt7915_phy *phy,
  				  struct ieee80211_sta *sta);
@@ -367,7 +367,7 @@
  int mt7915_mcu_set_edcca(struct mt7915_phy *phy, int mode, u8 *value, s8 compensation);
  int mt7915_mcu_get_edcca(struct mt7915_phy *phy, u8 mode, s8 *value);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 53294c1..352b8e9 100644
+index 0677495c..3291aafc 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3945,6 +3945,7 @@ int mt7915_mtk_init_debugfs(struct mt7915_phy *phy, struct dentry *dir)
@@ -379,10 +379,10 @@
  	debugfs_create_devm_seqfile(dev->mt76.dev, "eeprom_mode", dir,
  				    mt7915_show_eeprom_mode);
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 432d750..566fec0 100644
+index 6446439f..a9e87a17 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -106,6 +106,13 @@ bss_color_ctrl_policy[NUM_MTK_VENDOR_ATTRS_BSS_COLOR_CTRL] = {
+@@ -107,6 +107,13 @@ bss_color_ctrl_policy[NUM_MTK_VENDOR_ATTRS_BSS_COLOR_CTRL] = {
  	[MTK_VENDOR_ATTR_AVAL_BSS_COLOR_BMP] = { .type = NLA_U64 },
  };
  
@@ -396,7 +396,7 @@
  struct csi_null_tone {
  	u8 start;
  	u8 end;
-@@ -1335,6 +1342,63 @@ mt7915_vendor_bss_color_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev
+@@ -1471,6 +1478,63 @@ mt7915_vendor_bss_color_ctrl_dump(struct wiphy *wiphy, struct wireless_dev *wdev
  	return len;
  }
  
@@ -460,7 +460,7 @@
  static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  	{
  		.info = {
-@@ -1451,6 +1515,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1587,6 +1651,17 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.dumpit = mt7915_vendor_bss_color_ctrl_dump,
  		.policy = bss_color_ctrl_policy,
  		.maxattr = MTK_VENDOR_ATTR_BSS_COLOR_CTRL_MAX,
@@ -479,7 +479,7 @@
  };
  
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 03d1660..5b8a1fb 100644
+index 11ccd0d8..3040007f 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -16,6 +16,7 @@ enum mtk_nl80211_vendor_subcmds {
@@ -490,7 +490,7 @@
  };
  
  
-@@ -274,4 +275,18 @@ enum mtk_vendor_attr_bss_color_ctrl {
+@@ -287,4 +288,18 @@ enum mtk_vendor_attr_bss_color_ctrl {
  	MTK_VENDOR_ATTR_BSS_COLOR_CTRL_MAX =
  		NUM_MTK_VENDOR_ATTRS_BSS_COLOR_CTRL - 1
  };
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1043-wifi-mt76-testmode-add-cheetah-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1043-wifi-mt76-testmode-add-cheetah-support.patch
similarity index 92%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1043-wifi-mt76-testmode-add-cheetah-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1043-wifi-mt76-testmode-add-cheetah-support.patch
index fcc126c..c568929 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1043-wifi-mt76-testmode-add-cheetah-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1043-wifi-mt76-testmode-add-cheetah-support.patch
@@ -1,7 +1,7 @@
-From 6adb4d938ebedcb3e842640678b8aa510ee0b088 Mon Sep 17 00:00:00 2001
+From 3eec1f57a5ad5fd0322ac69360cac993ef9f8902 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Tue, 31 Oct 2023 16:29:13 +0800
-Subject: [PATCH 1043/1051] wifi: mt76: testmode: add cheetah support
+Subject: [PATCH 1043/1052] wifi: mt76: testmode: add cheetah support
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 ---
@@ -9,7 +9,7 @@
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index faf6014..ecd6271 100644
+index faf60146..ecd62712 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -2151,7 +2151,7 @@ mt7915_tm_group_prek(struct mt7915_phy *phy, enum mt76_testmode_state state)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1044-wifi-mt76-mt7915-add-no_beacon-vendor-command-for-ce.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1044-wifi-mt76-mt7915-add-no_beacon-vendor-command-for-ce.patch
similarity index 87%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1044-wifi-mt76-mt7915-add-no_beacon-vendor-command-for-ce.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1044-wifi-mt76-mt7915-add-no_beacon-vendor-command-for-ce.patch
index 0f1deb4..bcc0450 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1044-wifi-mt76-mt7915-add-no_beacon-vendor-command-for-ce.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1044-wifi-mt76-mt7915-add-no_beacon-vendor-command-for-ce.patch
@@ -1,7 +1,7 @@
-From 2a8762458470dcbeb3619d6833b7a072b3f57c4d Mon Sep 17 00:00:00 2001
+From e91a2d40ac3cb7c76827b894c03e31e577944f68 Mon Sep 17 00:00:00 2001
 From: MeiChia Chiu <MeiChia.Chiu@mediatek.com>
 Date: Wed, 24 Jan 2024 14:39:14 +0800
-Subject: [PATCH 1044/1051] wifi: mt76: mt7915: add no_beacon vendor command
+Subject: [PATCH 1044/1052] wifi: mt76: mt7915: add no_beacon vendor command
  for cert
 
 Add the vendor command to disable/enable beacon
@@ -21,7 +21,7 @@
  4 files changed, 65 insertions(+), 1 deletion(-)
 
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 196cc33..fda1efe 100644
+index 0fba0a6d..b1cb7747 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -5101,6 +5101,17 @@ int mt7915_mcu_set_rfeature_trig_type(struct mt7915_phy *phy, u8 enable, u8 trig
@@ -43,10 +43,10 @@
  
  #ifdef MTK_DEBUG
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index d524fbf..223e034 100644
+index 74008d4f..8b2e360e 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -811,6 +811,7 @@ void mt7915_vendor_amnt_fill_rx(struct mt7915_phy *phy, struct sk_buff *skb);
+@@ -827,6 +827,7 @@ void mt7915_vendor_amnt_fill_rx(struct mt7915_phy *phy, struct sk_buff *skb);
  int mt7915_vendor_amnt_sta_remove(struct mt7915_phy *phy,
  				  struct ieee80211_sta *sta);
  int mt7915_mcu_set_lpi(struct mt7915_phy *phy, bool en);
@@ -55,10 +55,10 @@
  int mt7915_mcu_set_edcca(struct mt7915_phy *phy, int mode, u8 *value, s8 compensation);
  int mt7915_mcu_get_edcca(struct mt7915_phy *phy, u8 mode, s8 *value);
 diff --git a/mt7915/vendor.c b/mt7915/vendor.c
-index 566fec0..6154d1a 100644
+index a9e87a17..309480d1 100644
 --- a/mt7915/vendor.c
 +++ b/mt7915/vendor.c
-@@ -113,6 +113,11 @@ txpower_ctrl_policy[NUM_MTK_VENDOR_ATTRS_TXPOWER_CTRL] = {
+@@ -114,6 +114,11 @@ txpower_ctrl_policy[NUM_MTK_VENDOR_ATTRS_TXPOWER_CTRL] = {
  	[MTK_VENDOR_ATTR_TXPOWER_CTRL_BCN_DUP] = { .type = NLA_U8 },
  };
  
@@ -70,7 +70,7 @@
  struct csi_null_tone {
  	u8 start;
  	u8 end;
-@@ -1399,6 +1404,30 @@ static int mt7915_vendor_txpower_ctrl(struct wiphy *wiphy,
+@@ -1535,6 +1540,30 @@ static int mt7915_vendor_txpower_ctrl(struct wiphy *wiphy,
  	return 0;
  }
  
@@ -101,7 +101,7 @@
  static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  	{
  		.info = {
-@@ -1526,7 +1555,18 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
+@@ -1662,7 +1691,18 @@ static const struct wiphy_vendor_command mt7915_vendor_commands[] = {
  		.doit = mt7915_vendor_txpower_ctrl,
  		.policy = txpower_ctrl_policy,
  		.maxattr = MTK_VENDOR_ATTR_TXPOWER_CTRL_MAX,
@@ -122,7 +122,7 @@
  
  void mt7915_vendor_register(struct mt7915_phy *phy)
 diff --git a/mt7915/vendor.h b/mt7915/vendor.h
-index 5b8a1fb..661d636 100644
+index 3040007f..bcde5d3c 100644
 --- a/mt7915/vendor.h
 +++ b/mt7915/vendor.h
 @@ -16,6 +16,7 @@ enum mtk_nl80211_vendor_subcmds {
@@ -133,7 +133,7 @@
  	MTK_NL80211_VENDOR_SUBCMD_TXPOWER_CTRL = 0xce,
  };
  
-@@ -289,4 +290,15 @@ enum mtk_vendor_attr_txpower_ctrl {
+@@ -302,4 +303,15 @@ enum mtk_vendor_attr_txpower_ctrl {
  		NUM_MTK_VENDOR_ATTRS_TXPOWER_CTRL - 1
  };
  
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1045-wifi-mt76-mt7915-support-spatial-reuse-debug-command.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1045-wifi-mt76-mt7915-support-spatial-reuse-debug-command.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1045-wifi-mt76-mt7915-support-spatial-reuse-debug-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1045-wifi-mt76-mt7915-support-spatial-reuse-debug-command.patch
index d30d6be..495efa1 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1045-wifi-mt76-mt7915-support-spatial-reuse-debug-command.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1045-wifi-mt76-mt7915-support-spatial-reuse-debug-command.patch
@@ -1,7 +1,7 @@
-From e64321af1c112f7a5f4c72a23fe96573b7f14a1f Mon Sep 17 00:00:00 2001
+From 40e0945208ca6569cc032b59f935223b8fac19f4 Mon Sep 17 00:00:00 2001
 From: Howard Hsu <howard-yh.hsu@mediatek.com>
 Date: Thu, 15 Feb 2024 11:16:16 +0800
-Subject: [PATCH 1045/1051] wifi: mt76: mt7915: support spatial reuse debug
+Subject: [PATCH 1045/1052] wifi: mt76: mt7915: support spatial reuse debug
  commands
 
 Support 3 spatial reuse debug commands:
@@ -19,10 +19,10 @@
  5 files changed, 191 insertions(+), 4 deletions(-)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 4f87e25..292ef0f 100644
+index 3148526a..d8b001f1 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1031,6 +1031,7 @@ enum {
+@@ -1032,6 +1032,7 @@ enum {
  	MCU_EXT_EVENT_WA_TX_STAT = 0x74,
  	MCU_EXT_EVENT_BCC_NOTIFY = 0x75,
  	MCU_EXT_EVENT_MURU_CTRL = 0x9f,
@@ -31,7 +31,7 @@
  };
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index fda1efe..cb78961 100644
+index b1cb7747..e505664e 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -452,6 +452,91 @@ mt7915_mcu_rx_bss_acq_pkt_cnt(struct mt7915_dev *dev, struct sk_buff * skb)
@@ -158,7 +158,7 @@
  		return 0;
  
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 742a785..f476767 100644
+index 742a7855..f4767671 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -42,6 +42,45 @@ struct mt7915_mcu_thermal_notify {
@@ -233,10 +233,10 @@
  	THERMAL_PROTECT_PARAMETER_CTRL,
  	THERMAL_PROTECT_BASIC_INFO,
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 223e034..a6901dd 100644
+index 8b2e360e..10d48495 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -356,6 +356,9 @@ struct mt7915_phy {
+@@ -371,6 +371,9 @@ struct mt7915_phy {
  	struct mt7915_air_monitor_ctrl amnt_ctrl;
  #endif
  	struct mt7915_scs_ctrl scs_ctrl;
@@ -247,7 +247,7 @@
  
  #ifdef MTK_DEBUG
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 352b8e9..0f72f30 100644
+index 3291aafc..c8dd569c 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -3809,16 +3809,34 @@ mt7915_sw_aci_set(void *data, u64 val)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1046-wifi-mt76-try-more-times-when-send-message-timeout.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1046-wifi-mt76-try-more-times-when-send-message-timeout.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1046-wifi-mt76-try-more-times-when-send-message-timeout.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1046-wifi-mt76-try-more-times-when-send-message-timeout.patch
index 8416215..9ac79e7 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1046-wifi-mt76-try-more-times-when-send-message-timeout.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1046-wifi-mt76-try-more-times-when-send-message-timeout.patch
@@ -1,7 +1,7 @@
-From 526b34aec94a2d244441a844c84862e35f1162a5 Mon Sep 17 00:00:00 2001
+From 73508da4263fcc10cd059fd89ef4017f9725324d Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Thu, 7 Mar 2024 11:13:45 +0800
-Subject: [PATCH 1046/1051] wifi: mt76: try more times when send message
+Subject: [PATCH 1046/1052] wifi: mt76: try more times when send message
  timeout.
 
 CR-Id: WCNCR00334773
@@ -13,7 +13,7 @@
  3 files changed, 64 insertions(+), 52 deletions(-)
 
 diff --git a/dma.c b/dma.c
-index bc8afcf..133a50d 100644
+index bc8afcff..133a50dc 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -504,9 +504,12 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q,
@@ -40,7 +40,7 @@
  
  static int
 diff --git a/mcu.c b/mcu.c
-index fa4b054..de185cc 100644
+index fa4b0544..de185cc9 100644
 --- a/mcu.c
 +++ b/mcu.c
 @@ -4,6 +4,7 @@
@@ -133,7 +133,7 @@
  
  	return ret;
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index fb98940..b3c9163 100644
+index fb989405..b3c91633 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1348,12 +1348,6 @@ mt7915_mac_restart(struct mt7915_dev *dev)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1047-wifi-mt76-mt7915-add-SER-overlap-handle.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1047-wifi-mt76-mt7915-add-SER-overlap-handle.patch
similarity index 92%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1047-wifi-mt76-mt7915-add-SER-overlap-handle.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1047-wifi-mt76-mt7915-add-SER-overlap-handle.patch
index b8314fd..850d699 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1047-wifi-mt76-mt7915-add-SER-overlap-handle.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1047-wifi-mt76-mt7915-add-SER-overlap-handle.patch
@@ -1,7 +1,7 @@
-From 0f8d644d9c7ab28e9e4da56151987a3e4be1f55f Mon Sep 17 00:00:00 2001
+From 1b93f1495d5f28a7620add2ebea0f691ff6e8a0d Mon Sep 17 00:00:00 2001
 From: Bo Jiao <Bo.Jiao@mediatek.com>
 Date: Tue, 6 Feb 2024 14:46:59 +0800
-Subject: [PATCH 1047/1051] wifi: mt76: mt7915: add SER overlap handle
+Subject: [PATCH 1047/1052] wifi: mt76: mt7915: add SER overlap handle
 
 CR-ID: WCNCR00355921
 Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
@@ -14,7 +14,7 @@
  5 files changed, 34 insertions(+), 3 deletions(-)
 
 diff --git a/dma.c b/dma.c
-index 133a50d..100d2af 100644
+index 133a50dc..100d2aff 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -506,7 +506,8 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q,
@@ -28,7 +28,7 @@
  		goto error;
  	}
 diff --git a/mcu.c b/mcu.c
-index de185cc..1bc94e8 100644
+index de185cc9..1bc94e85 100644
 --- a/mcu.c
 +++ b/mcu.c
 @@ -42,7 +42,9 @@ struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,
@@ -53,7 +53,7 @@
  			dev_err(dev->dev, "send message %08x timeout, try again(%d).\n",
  				cmd, (MT76_MSG_MAX_RETRY_CNT - retry_cnt));
 diff --git a/mt76.h b/mt76.h
-index a7a8ece..e6482e5 100644
+index a18b3e57..49ddaade 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -478,6 +478,14 @@ enum {
@@ -80,7 +80,7 @@
  	u32 wcid_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];
  	u32 wcid_phy_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index b3c9163..c84b957 100644
+index b3c91633..c84b9573 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1538,6 +1538,7 @@ void mt7915_mac_reset_work(struct work_struct *work)
@@ -116,7 +116,7 @@
  	wake_up(&dev->reset_wait);
  }
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index cb78961..f890063 100644
+index e505664e..272db06a 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -198,6 +198,13 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1048-wifi-mt76-mt7915-add-background-radar-hw-cap-check.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1048-wifi-mt76-mt7915-add-background-radar-hw-cap-check.patch
similarity index 90%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1048-wifi-mt76-mt7915-add-background-radar-hw-cap-check.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1048-wifi-mt76-mt7915-add-background-radar-hw-cap-check.patch
index 17e299e..ec0a323 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1048-wifi-mt76-mt7915-add-background-radar-hw-cap-check.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1048-wifi-mt76-mt7915-add-background-radar-hw-cap-check.patch
@@ -1,7 +1,7 @@
-From 3ad316d5a0d9caa9a07597ac59df0663daf3e319 Mon Sep 17 00:00:00 2001
+From 04882a33afbee2fd86cdb244a0faf0748f163b31 Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Mon, 4 Mar 2024 11:29:06 +0800
-Subject: [PATCH 1048/1051] wifi: mt76: mt7915: add background radar hw cap
+Subject: [PATCH 1048/1052] wifi: mt76: mt7915: add background radar hw cap
  check
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -12,7 +12,7 @@
  3 files changed, 39 insertions(+), 3 deletions(-)
 
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index b2a4ff4..03daf44 100644
+index f031b54c..3fd1654c 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -459,6 +459,11 @@ mt7915_rdd_monitor(struct seq_file *s, void *data)
@@ -28,7 +28,7 @@
  		ret = -EINVAL;
  		goto out;
 diff --git a/mt7915/eeprom.h b/mt7915/eeprom.h
-index 70fca0b..adeee10 100644
+index 70fca0b3..adeee104 100644
 --- a/mt7915/eeprom.h
 +++ b/mt7915/eeprom.h
 @@ -55,6 +55,7 @@ enum mt7915_eeprom_field {
@@ -76,10 +76,10 @@
  
  #endif
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 9932266..dc1b34d 100644
+index e8a6fcda..03c86ae0 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -404,9 +404,10 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+@@ -405,9 +405,10 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
  	if (!is_mt7915(&dev->mt76))
  		wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
  
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1049-wifi-mt76-mt7915-add-foolproof-mechanism-for-ZWDFS-d.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1049-wifi-mt76-mt7915-add-foolproof-mechanism-for-ZWDFS-d.patch
similarity index 85%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1049-wifi-mt76-mt7915-add-foolproof-mechanism-for-ZWDFS-d.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1049-wifi-mt76-mt7915-add-foolproof-mechanism-for-ZWDFS-d.patch
index 8aaa151..e626535 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1049-wifi-mt76-mt7915-add-foolproof-mechanism-for-ZWDFS-d.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1049-wifi-mt76-mt7915-add-foolproof-mechanism-for-ZWDFS-d.patch
@@ -1,7 +1,7 @@
-From 1de92bb3d5a816769f306322ae3c213adbacc6f1 Mon Sep 17 00:00:00 2001
+From 7f45a6881d88e92180fe2b162800b8334d005a5f Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Wed, 6 Mar 2024 11:30:34 +0800
-Subject: [PATCH 1049/1051] wifi: mt76: mt7915: add foolproof mechanism for
+Subject: [PATCH 1049/1052] wifi: mt76: mt7915: add foolproof mechanism for
  ZWDFS during radar detected & triggered
 
 Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
@@ -11,7 +11,7 @@
  2 files changed, 8 insertions(+)
 
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 03daf44..d8ca90a 100644
+index 3fd1654c..522e2999 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -231,6 +231,11 @@ mt7915_radar_trigger(void *data, u64 val)
@@ -27,7 +27,7 @@
  				       val, 0, 0);
  }
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index f890063..853a50e 100644
+index 272db06a..250b05ec 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -302,6 +302,9 @@ mt7915_mcu_rx_radar_detected(struct mt7915_dev *dev, struct sk_buff *skb)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1050-mtk-wifi-mt76-mt7915-assign-DEAUTH-to-ALTX-queue-for.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1050-mtk-wifi-mt76-mt7915-assign-DEAUTH-to-ALTX-queue-for.patch
similarity index 89%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1050-mtk-wifi-mt76-mt7915-assign-DEAUTH-to-ALTX-queue-for.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1050-mtk-wifi-mt76-mt7915-assign-DEAUTH-to-ALTX-queue-for.patch
index 2c5f484..05e22ba 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1050-mtk-wifi-mt76-mt7915-assign-DEAUTH-to-ALTX-queue-for.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1050-mtk-wifi-mt76-mt7915-assign-DEAUTH-to-ALTX-queue-for.patch
@@ -1,7 +1,7 @@
-From 236bc42c90160e3526d8901f3d983ebc76316ee2 Mon Sep 17 00:00:00 2001
+From 2ed70c162a13b4b4af3bfc7a806e8cfab29126f7 Mon Sep 17 00:00:00 2001
 From: Michael-CY Lee <michael-cy.lee@mediatek.com>
 Date: Tue, 19 Mar 2024 08:35:26 +0800
-Subject: [PATCH 1050/1051] mtk: wifi: mt76: mt7915: assign DEAUTH to ALTX
+Subject: [PATCH 1050/1052] mtk: wifi: mt76: mt7915: assign DEAUTH to ALTX
  queue for CERT
 
 Signed-off-by: Michael-CY Lee <michael-cy.lee@mediatek.com>
@@ -10,7 +10,7 @@
  1 file changed, 10 insertions(+)
 
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index d170815..21dadb5 100644
+index d1708152..21dadb55 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -385,6 +385,8 @@ mt76_connac2_mac_write_txwi_80211(struct mt76_dev *dev, __le32 *txwi,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1051-wifi-mt76-mt7915-set-channel-after-sta-is-associated.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1051-wifi-mt76-mt7915-set-channel-after-sta-is-associated.patch
similarity index 87%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1051-wifi-mt76-mt7915-set-channel-after-sta-is-associated.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1051-wifi-mt76-mt7915-set-channel-after-sta-is-associated.patch
index b969ef3..eabad84 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1051-wifi-mt76-mt7915-set-channel-after-sta-is-associated.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1051-wifi-mt76-mt7915-set-channel-after-sta-is-associated.patch
@@ -1,7 +1,7 @@
-From 29807a01daba2d3042a76b2427fbb24e1da71b28 Mon Sep 17 00:00:00 2001
+From 1d18008ab9d67f318932ed993103bd46d9f0215d Mon Sep 17 00:00:00 2001
 From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
 Date: Thu, 21 Mar 2024 16:52:34 +0800
-Subject: [PATCH 1051/1051] wifi: mt76: mt7915: set channel after sta is
+Subject: [PATCH 1051/1052] wifi: mt76: mt7915: set channel after sta is
  associated to adjust switch reason
 
 when sta is associated to AP operating in DFS channel, a channel
@@ -16,7 +16,7 @@
  1 file changed, 26 insertions(+)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index da998e1..c97974a 100644
+index 04301300..eab45737 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -794,6 +794,31 @@ out:
@@ -51,7 +51,7 @@
  int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
  		       struct ieee80211_sta *sta)
  {
-@@ -1784,6 +1809,7 @@ const struct ieee80211_ops mt7915_ops = {
+@@ -1835,6 +1860,7 @@ const struct ieee80211_ops mt7915_ops = {
  	.set_sar_specs = mt7915_set_sar_specs,
  	.channel_switch_beacon = mt7915_channel_switch_beacon,
  	.post_channel_switch = mt7915_post_channel_switch,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/1052-wifi-mt76-mt7915-Clear-private-driver-data-in-case-o.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1052-wifi-mt76-mt7915-Clear-private-driver-data-in-case-o.patch
similarity index 77%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/1052-wifi-mt76-mt7915-Clear-private-driver-data-in-case-o.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1052-wifi-mt76-mt7915-Clear-private-driver-data-in-case-o.patch
index 2f6e452..a9ff608 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/1052-wifi-mt76-mt7915-Clear-private-driver-data-in-case-o.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/1052-wifi-mt76-mt7915-Clear-private-driver-data-in-case-o.patch
@@ -1,8 +1,8 @@
-From f92bc600352365982f4c674de61454dfdcba6bcd Mon Sep 17 00:00:00 2001
+From 903edd4667682289fca8cb7fac0f407c34598e5c Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Fri, 5 Jul 2024 17:50:29 +0800
-Subject: [PATCH] wifi: mt76: mt7915: Clear private driver data in case of
- reuse
+Subject: [PATCH 1052/1052] wifi: mt76: mt7915: Clear private driver data in
+ case of reuse
 
 Signed-off-by: Rex Lu <rex.lu@mediatek.com>
 ---
@@ -10,7 +10,7 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 6912ea7..4a4c372 100644
+index eab45737..8c498683 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -230,6 +230,9 @@ int mt7915_init_vif(struct mt7915_phy *phy, struct ieee80211_vif *vif, bool bf_e
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2000-wifi-mt76-mt7915-wed-add-wed-tx-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2000-wifi-mt76-mt7915-wed-add-wed-tx-support.patch
similarity index 91%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2000-wifi-mt76-mt7915-wed-add-wed-tx-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2000-wifi-mt76-mt7915-wed-add-wed-tx-support.patch
index 1d5e567..0653704 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2000-wifi-mt76-mt7915-wed-add-wed-tx-support.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2000-wifi-mt76-mt7915-wed-add-wed-tx-support.patch
@@ -1,4 +1,4 @@
-From 3af8d78c5f9622276367d9e71921fe25f9d211b5 Mon Sep 17 00:00:00 2001
+From aba91915c426953a680062a8e3528b7ca90054e9 Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Fri, 25 Nov 2022 10:38:53 +0800
 Subject: [PATCH 2000/2015] wifi: mt76: mt7915: wed: add wed tx support
@@ -14,7 +14,7 @@
  6 files changed, 14 insertions(+), 8 deletions(-)
 
 diff --git a/mt76_connac.h b/mt76_connac.h
-index 8e7068c..e1d6ca2 100644
+index 5356c52c..93856347 100644
 --- a/mt76_connac.h
 +++ b/mt76_connac.h
 @@ -130,6 +130,7 @@ struct mt76_connac_sta_key_conf {
@@ -26,7 +26,7 @@
  struct mt76_connac_fw_txp {
  	__le16 flags;
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index c84b957..1c8b873 100644
+index c84b9573..1c8b8732 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -878,9 +878,9 @@ u32 mt7915_wed_init_buf(void *ptr, dma_addr_t phys, int token_id)
@@ -67,10 +67,10 @@
  
  static void
 diff --git a/mt7915/main.c b/mt7915/main.c
-index c97974a..ed7ade1 100644
+index 8c498683..ff0337a6 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
-@@ -1761,14 +1761,14 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw,
+@@ -1816,14 +1816,14 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw,
  	if (!mtk_wed_device_active(wed))
  		return -ENODEV;
  
@@ -88,7 +88,7 @@
  
  	ctx->dev = NULL;
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 437a9b0..91100f1 100644
+index b1b219ce..53648212 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -13,7 +13,7 @@
@@ -109,7 +109,7 @@
  	ret = dma_set_mask(wed->dev, DMA_BIT_MASK(32));
  	if (ret)
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index a6901dd..2dce288 100644
+index 10d48495..d93ab970 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -62,7 +62,7 @@
@@ -122,7 +122,7 @@
  
  #define MT7915_CFEND_RATE_DEFAULT	0x49	/* OFDM 24M */
 diff --git a/wed.c b/wed.c
-index f7a3f1b..47c81a2 100644
+index f7a3f1b3..47c81a28 100644
 --- a/wed.c
 +++ b/wed.c
 @@ -187,7 +187,7 @@ void mt76_wed_offload_disable(struct mtk_wed_device *wed)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2001-wifi-mt76-mt7915-wed-add-wds-support-when-wed-is-ena.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2001-wifi-mt76-mt7915-wed-add-wds-support-when-wed-is-ena.patch
similarity index 91%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2001-wifi-mt76-mt7915-wed-add-wds-support-when-wed-is-ena.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2001-wifi-mt76-mt7915-wed-add-wds-support-when-wed-is-ena.patch
index c8e6888..35edec4 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2001-wifi-mt76-mt7915-wed-add-wds-support-when-wed-is-ena.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2001-wifi-mt76-mt7915-wed-add-wds-support-when-wed-is-ena.patch
@@ -1,4 +1,4 @@
-From 0454c032c589da59ef4e44654d2f650e273e215a Mon Sep 17 00:00:00 2001
+From 2845e9a6b55d63d970541c8322eec387bfa252e4 Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Tue, 13 Dec 2022 17:51:26 +0800
 Subject: [PATCH 2001/2015] wifi: mt76: mt7915: wed: add wds support when wed
@@ -15,7 +15,7 @@
  6 files changed, 82 insertions(+), 10 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index e6482e5..6168758 100644
+index 49ddaade..411a9576 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -78,6 +78,12 @@ enum mt76_wed_type {
@@ -32,10 +32,10 @@
  	u32 (*rr)(struct mt76_dev *dev, u32 offset);
  	void (*wr)(struct mt76_dev *dev, u32 offset, u32 val);
 diff --git a/mt7915/main.c b/mt7915/main.c
-index ed7ade1..6276230 100644
+index ff0337a6..778c73e9 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
-@@ -831,8 +831,15 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
+@@ -834,8 +834,15 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
  #endif
  	int ret, idx;
  	u32 addr;
@@ -52,7 +52,7 @@
  	if (idx < 0)
  		return -ENOSPC;
  
-@@ -1323,6 +1330,13 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
+@@ -1335,6 +1342,13 @@ static void mt7915_sta_set_4addr(struct ieee80211_hw *hw,
  	else
  		clear_bit(MT_WCID_FLAG_4ADDR, &msta->wcid.flags);
  
@@ -66,7 +66,7 @@
  	mt76_connac_mcu_wtbl_update_hdr_trans(&dev->mt76, vif, sta);
  }
  
-@@ -1768,8 +1782,12 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw,
+@@ -1823,8 +1837,12 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw,
  	path->dev = ctx->dev;
  	path->mtk_wdma.wdma_idx = wed->wdma_idx;
  	path->mtk_wdma.bss = mvif->mt76.idx;
@@ -81,7 +81,7 @@
  	ctx->dev = NULL;
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 853a50e..4390f42 100644
+index 250b05ec..7927a523 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -2588,10 +2588,18 @@ int mt7915_mcu_init_firmware(struct mt7915_dev *dev)
@@ -108,7 +108,7 @@
  	ret = mt7915_mcu_set_mwds(dev, 1);
  	if (ret)
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index f476767..52baaa7 100644
+index f4767671..52baaa73 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -392,6 +392,7 @@ enum {
@@ -120,7 +120,7 @@
  	MCU_WA_PARAM_RED_SHOW_STA = 0xf,
  	MCU_WA_PARAM_RED_TARGET_DELAY = 0x10,
 diff --git a/util.c b/util.c
-index fc76c66..61b2d30 100644
+index d6c01a2d..995d7880 100644
 --- a/util.c
 +++ b/util.c
 @@ -42,9 +42,14 @@ bool ____mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val,
@@ -188,7 +188,7 @@
  int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy)
  {
 diff --git a/util.h b/util.h
-index 260965d..99b7263 100644
+index 260965dd..99b7263c 100644
 --- a/util.h
 +++ b/util.h
 @@ -27,7 +27,12 @@ enum {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2002-wifi-mt76-mt7915-wed-add-fill-receive-path-to-report.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2002-wifi-mt76-mt7915-wed-add-fill-receive-path-to-report.patch
similarity index 83%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2002-wifi-mt76-mt7915-wed-add-fill-receive-path-to-report.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2002-wifi-mt76-mt7915-wed-add-fill-receive-path-to-report.patch
index be6d9da..6e78804 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2002-wifi-mt76-mt7915-wed-add-fill-receive-path-to-report.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2002-wifi-mt76-mt7915-wed-add-fill-receive-path-to-report.patch
@@ -1,4 +1,4 @@
-From 21586d3a17ba293d3d80bd93fb404729647820bd Mon Sep 17 00:00:00 2001
+From 0f848ffb35cc45beb156069d3856b14414e9a6ee Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Fri, 19 May 2023 07:05:22 +0800
 Subject: [PATCH 2002/2015] wifi: mt76: mt7915: wed: add fill receive path to
@@ -10,10 +10,10 @@
  1 file changed, 18 insertions(+)
 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 6276230..fbb2aff 100644
+index 778c73e9..abafa5e4 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
-@@ -1798,6 +1798,23 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw,
+@@ -1848,6 +1848,23 @@ mt7915_net_fill_forward_path(struct ieee80211_hw *hw,
  
  	return 0;
  }
@@ -37,7 +37,7 @@
  #endif
  
  const struct ieee80211_ops mt7915_ops = {
-@@ -1855,6 +1872,7 @@ const struct ieee80211_ops mt7915_ops = {
+@@ -1910,6 +1927,7 @@ const struct ieee80211_ops mt7915_ops = {
  	.set_radar_background = mt7915_set_radar_background,
  #ifdef CONFIG_NET_MEDIATEK_SOC_WED
  	.net_fill_forward_path = mt7915_net_fill_forward_path,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2003-wifi-mt76-mt7915-wed-find-rx-token-by-physical-addre.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2003-wifi-mt76-mt7915-wed-find-rx-token-by-physical-addre.patch
similarity index 93%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2003-wifi-mt76-mt7915-wed-find-rx-token-by-physical-addre.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2003-wifi-mt76-mt7915-wed-find-rx-token-by-physical-addre.patch
index f2e3d14..ef36792 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2003-wifi-mt76-mt7915-wed-find-rx-token-by-physical-addre.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2003-wifi-mt76-mt7915-wed-find-rx-token-by-physical-addre.patch
@@ -1,4 +1,4 @@
-From 5a0028b27ba80cb34d905a668e335fb2c55685d1 Mon Sep 17 00:00:00 2001
+From 6d6ae068e478b101556ae723c23533220a8daeb5 Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Fri, 25 Nov 2022 14:32:35 +0800
 Subject: [PATCH 2003/2015] wifi: mt76: mt7915: wed: find rx token by physical
@@ -13,7 +13,7 @@
  1 file changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/dma.c b/dma.c
-index 100d2af..185c6f1 100644
+index 100d2aff..185c6f12 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -444,9 +444,32 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2004-wifi-mt76-mt7915-wed-HW-ATF-support-for-mt7986.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2004-wifi-mt76-mt7915-wed-HW-ATF-support-for-mt7986.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2004-wifi-mt76-mt7915-wed-HW-ATF-support-for-mt7986.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2004-wifi-mt76-mt7915-wed-HW-ATF-support-for-mt7986.patch
index f9bf272..65b6630 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2004-wifi-mt76-mt7915-wed-HW-ATF-support-for-mt7986.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2004-wifi-mt76-mt7915-wed-HW-ATF-support-for-mt7986.patch
@@ -1,4 +1,4 @@
-From 08b72ac5e48038ff9c6a13adeb5273c07ba6e5a6 Mon Sep 17 00:00:00 2001
+From 065fd51b334f21e004e8a0e03e4d90a4e8265d98 Mon Sep 17 00:00:00 2001
 From: Lian Chen <lian.chen@mediatek.com>
 Date: Mon, 7 Nov 2022 14:47:44 +0800
 Subject: [PATCH 2004/2015] wifi: mt76: mt7915: wed: HW ATF support for mt7986
@@ -16,10 +16,10 @@
  7 files changed, 796 insertions(+), 3 deletions(-)
 
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 292ef0f..3786e69 100644
+index d8b001f1..1721f9b5 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1209,6 +1209,7 @@ enum {
+@@ -1211,6 +1211,7 @@ enum {
  	MCU_EXT_CMD_THERMAL_CTRL = 0x2c,
  	MCU_EXT_CMD_WTBL_UPDATE = 0x32,
  	MCU_EXT_CMD_SET_DRR_CTRL = 0x36,
@@ -27,7 +27,7 @@
  	MCU_EXT_CMD_SET_RDD_CTRL = 0x3a,
  	MCU_EXT_CMD_ATE_CTRL = 0x3d,
  	MCU_EXT_CMD_PROTECT_CTRL = 0x3e,
-@@ -1218,6 +1219,7 @@ enum {
+@@ -1220,6 +1221,7 @@ enum {
  	MCU_EXT_CMD_MUAR_UPDATE = 0x48,
  	MCU_EXT_CMD_BCN_OFFLOAD = 0x49,
  	MCU_EXT_CMD_RX_AIRTIME_CTRL = 0x4a,
@@ -36,7 +36,7 @@
  	MCU_EXT_CMD_EFUSE_FREE_BLOCK = 0x4f,
  	MCU_EXT_CMD_TX_POWER_FEATURE_CTRL = 0x58,
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index d8ca90a..3ae4aca 100644
+index 522e2999..576ec1a5 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -12,6 +12,10 @@
@@ -409,7 +409,7 @@
  static int
  mt7915_radar_trigger(void *data, u64 val)
  {
-@@ -1526,6 +1882,7 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
+@@ -1571,6 +1927,7 @@ int mt7915_init_debugfs(struct mt7915_phy *phy)
  	debugfs_create_devm_seqfile(dev->mt76.dev, "twt_stats", dir,
  				    mt7915_twt_stats);
  	debugfs_create_file("rf_regval", 0600, dir, dev, &fops_rf_regval);
@@ -418,10 +418,10 @@
  	if (!dev->dbdc_support || phy->mt76->band_idx) {
  		debugfs_create_u32("dfs_hw_pattern", 0400, dir,
 diff --git a/mt7915/init.c b/mt7915/init.c
-index dc1b34d..f38c8a1 100644
+index 03c86ae0..7f210669 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -588,9 +588,64 @@ mt7915_init_led_mux(struct mt7915_dev *dev)
+@@ -589,9 +589,64 @@ mt7915_init_led_mux(struct mt7915_dev *dev)
  	}
  }
  
@@ -484,9 +484,9 @@
  	int i;
 +	struct wiphy *wiphy = dev->phy.mt76->hw->wiphy;
  
- 	if (!is_mt7915(&dev->mt76))
- 		mt76_clear(dev, MT_MDP_DCR2, MT_MDP_DCR2_RX_TRANS_SHORT);
-@@ -604,6 +659,9 @@ void mt7915_mac_init(struct mt7915_dev *dev)
+ 	/* config pse qid6 wfdma port selection */
+ 	if (!is_mt7915(&dev->mt76) && dev->hif2)
+@@ -610,6 +665,9 @@ void mt7915_mac_init(struct mt7915_dev *dev)
  		mt7915_mac_init_band(dev, i);
  
  	mt7915_init_led_mux(dev);
@@ -497,7 +497,7 @@
  
  int mt7915_txbf_init(struct mt7915_dev *dev)
 diff --git a/mt7915/main.c b/mt7915/main.c
-index fbb2aff..feb2c89 100644
+index abafa5e4..ecfd9307 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
 @@ -226,6 +226,7 @@ int mt7915_init_vif(struct mt7915_phy *phy, struct ieee80211_vif *vif, bool bf_e
@@ -508,7 +508,7 @@
  	struct mt76_txq *mtxq;
  	bool ext_phy = phy != &dev->phy;
  	int idx, ret = 0;
-@@ -288,6 +289,9 @@ int mt7915_init_vif(struct mt7915_phy *phy, struct ieee80211_vif *vif, bool bf_e
+@@ -291,6 +292,9 @@ int mt7915_init_vif(struct mt7915_phy *phy, struct ieee80211_vif *vif, bool bf_e
  	mt7915_mcu_add_sta(dev, vif, NULL, true);
  	rcu_assign_pointer(dev->mt76.wcid[idx], &mvif->sta.wcid);
  
@@ -518,7 +518,7 @@
  	return ret;
  }
  
-@@ -826,6 +830,7 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
+@@ -829,6 +833,7 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
  	struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;
  	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
  	bool ext_phy = mvif->phy != &dev->phy;
@@ -526,7 +526,7 @@
  #ifdef CONFIG_MTK_VENDOR
  	struct mt7915_phy *phy = ext_phy ? mt7915_ext_phy(dev) : &dev->phy;
  #endif
-@@ -876,6 +881,15 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
+@@ -879,6 +884,15 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
  	if (phy->muru_onoff & MUMIMO_DL_CERT)
  		mt7915_mcu_set_mimo(phy, 0);
  #endif
@@ -543,7 +543,7 @@
  }
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 4390f42..e6e3152 100644
+index 7927a523..570dd171 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -1866,7 +1866,7 @@ mt7915_mcu_add_group(struct mt7915_dev *dev, struct ieee80211_vif *vif,
@@ -746,7 +746,7 @@
  {
  #define MT_BF_PROCESSING	4
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 2dce288..1d0cfa1 100644
+index d93ab970..9ea30f1d 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -141,6 +141,58 @@ struct mt7915_twt_flow {
@@ -816,7 +816,7 @@
  };
  
  struct mt7915_vif_cap {
-@@ -492,6 +545,8 @@ struct mt7915_dev {
+@@ -507,6 +560,8 @@ struct mt7915_dev {
  #endif
  
  	struct delayed_work scs_work;
@@ -825,7 +825,7 @@
  
  	bool wmm_pbc_enable;
  	struct work_struct wmm_pbc_work;
-@@ -528,6 +583,15 @@ enum mt7915_rdd_cmd {
+@@ -543,6 +598,15 @@ enum mt7915_rdd_cmd {
  	RDD_IRQ_OFF,
  };
  
@@ -841,7 +841,7 @@
  static inline struct mt7915_phy *
  mt7915_hw_phy(struct ieee80211_hw *hw)
  {
-@@ -657,6 +721,11 @@ int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band, bool enable,
+@@ -672,6 +736,11 @@ int mt7915_mcu_set_mac(struct mt7915_dev *dev, int band, bool enable,
  int mt7915_mcu_set_test_param(struct mt7915_dev *dev, u8 param, bool test_mode,
  			      u8 en);
  int mt7915_mcu_set_ser(struct mt7915_dev *dev, u8 action, u8 set, u8 band);
@@ -854,7 +854,7 @@
  int mt7915_mcu_set_txpower_sku(struct mt7915_phy *phy);
  int mt7915_mcu_get_txpower_sku(struct mt7915_phy *phy, s8 *txpower, int len,
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 0f72f30..14ea5bc 100644
+index c8dd569c..d6e92b12 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -1518,6 +1518,136 @@ static void chip_get_sta_pause(struct mt7915_dev *dev, u32 *sta_pause)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2005-wifi-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rr.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2005-wifi-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rr.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2005-wifi-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rr.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2005-wifi-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rr.patch
index 053fc86..ae9b7c0 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2005-wifi-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rr.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2005-wifi-mt76-mt7915-wed-add-rxwi-for-further-in-chip-rr.patch
@@ -1,4 +1,4 @@
-From 4faced46403673e8089b9c4cc89d55f7d9fd5e6d Mon Sep 17 00:00:00 2001
+From b6184a94736ddea3277b1bea374686edb9aef6b4 Mon Sep 17 00:00:00 2001
 From: Sujuan Chen <sujuan.chen@mediatek.com>
 Date: Fri, 6 Jan 2023 18:18:50 +0800
 Subject: [PATCH 2005/2015] wifi: mt76: mt7915: wed: add rxwi for further in
@@ -17,7 +17,7 @@
  8 files changed, 87 insertions(+), 80 deletions(-)
 
 diff --git a/dma.c b/dma.c
-index 185c6f1..9cd97d2 100644
+index 185c6f12..9cd97d24 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -64,17 +64,17 @@ mt76_alloc_txwi(struct mt76_dev *dev)
@@ -245,10 +245,10 @@
  unmap:
  	for (n--; n > 0; n--)
 diff --git a/mac80211.c b/mac80211.c
-index f9dfdf8..225b290 100644
+index 750a642a..e50c68f8 100644
 --- a/mac80211.c
 +++ b/mac80211.c
-@@ -618,7 +618,6 @@ mt76_alloc_device(struct device *pdev, unsigned int size,
+@@ -619,7 +619,6 @@ mt76_alloc_device(struct device *pdev, unsigned int size,
  	spin_lock_init(&dev->lock);
  	spin_lock_init(&dev->cc_lock);
  	spin_lock_init(&dev->status_lock);
@@ -256,7 +256,7 @@
  	mutex_init(&dev->mutex);
  	init_waitqueue_head(&dev->tx_wait);
  
-@@ -651,6 +650,7 @@ mt76_alloc_device(struct device *pdev, unsigned int size,
+@@ -652,6 +651,7 @@ mt76_alloc_device(struct device *pdev, unsigned int size,
  	INIT_LIST_HEAD(&dev->txwi_cache);
  	INIT_LIST_HEAD(&dev->rxwi_cache);
  	dev->token_size = dev->drv->token_size;
@@ -265,7 +265,7 @@
  	for (i = 0; i < ARRAY_SIZE(dev->q_rx); i++)
  		skb_queue_head_init(&dev->rx_skb[i]);
 diff --git a/mt76.h b/mt76.h
-index 6168758..5e71267 100644
+index 411a9576..40884fd8 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -193,6 +193,7 @@ struct mt76_queue_entry {
@@ -323,7 +323,7 @@
  void mt76_free_pending_rxwi(struct mt76_dev *dev);
  void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,
  		      struct napi_struct *napi);
-@@ -1819,9 +1825,9 @@ mt76_token_release(struct mt76_dev *dev, int token, bool *wake);
+@@ -1831,9 +1837,9 @@ mt76_token_release(struct mt76_dev *dev, int token, bool *wake);
  int mt76_token_consume(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi,
  		       u8 phy_idx);
  void __mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked);
@@ -336,7 +336,7 @@
  static inline void mt76_set_tx_blocked(struct mt76_dev *dev, bool blocked)
  {
 diff --git a/mt7915/dma.c b/mt7915/dma.c
-index 0baa82c..552410a 100644
+index 0baa82c8..552410aa 100644
 --- a/mt7915/dma.c
 +++ b/mt7915/dma.c
 @@ -512,7 +512,6 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
@@ -356,7 +356,7 @@
  		}
  
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 91100f1..3391a94 100644
+index 53648212..baf35a53 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -725,7 +725,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
@@ -377,7 +377,7 @@
  		.tx_complete_skb = mt76_connac_tx_complete_skb,
  		.rx_skb = mt7915_queue_rx_skb,
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 1d0cfa1..f5a7e1e 100644
+index 9ea30f1d..55af5c8c 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -64,6 +64,7 @@
@@ -389,7 +389,7 @@
  #define MT7915_CFEND_RATE_DEFAULT	0x49	/* OFDM 24M */
  #define MT7915_CFEND_RATE_11B		0x03	/* 11B LP, 11M */
 diff --git a/tx.c b/tx.c
-index db0d4df..92afbf5 100644
+index db0d4df5..92afbf5d 100644
 --- a/tx.c
 +++ b/tx.c
 @@ -864,16 +864,16 @@ int mt76_token_consume(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi,
@@ -434,7 +434,7 @@
  }
  EXPORT_SYMBOL_GPL(mt76_rx_token_release);
 diff --git a/wed.c b/wed.c
-index 47c81a2..c03b52f 100644
+index 47c81a28..c03b52f9 100644
 --- a/wed.c
 +++ b/wed.c
 @@ -16,18 +16,18 @@ void mt76_wed_release_rx_buf(struct mtk_wed_device *wed)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2006-wifi-mt76-add-debugfs-knob-to-show-packet-error-rate.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2006-wifi-mt76-add-debugfs-knob-to-show-packet-error-rate.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2006-wifi-mt76-add-debugfs-knob-to-show-packet-error-rate.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2006-wifi-mt76-add-debugfs-knob-to-show-packet-error-rate.patch
index 57dba95..a0c7a95 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2006-wifi-mt76-add-debugfs-knob-to-show-packet-error-rate.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2006-wifi-mt76-add-debugfs-knob-to-show-packet-error-rate.patch
@@ -1,4 +1,4 @@
-From 358136dd0d94d84efda5c04e7b392111adcb2895 Mon Sep 17 00:00:00 2001
+From 35000e804c9cad780ee340efba7cebf461366cd3 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Wed, 11 Jan 2023 10:56:27 +0800
 Subject: [PATCH 2006/2015] wifi: mt76: add debugfs knob to show packet error
@@ -15,7 +15,7 @@
  6 files changed, 194 insertions(+), 1 deletion(-)
 
 diff --git a/mt76.h b/mt76.h
-index 5e71267..0ab1d74 100644
+index 40884fd8..7100934a 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -321,8 +321,10 @@ struct mt76_sta_stats {
@@ -30,10 +30,10 @@
  	u64 rx_bytes;
  	u32 rx_packets;
 diff --git a/mt76_connac_mcu.h b/mt76_connac_mcu.h
-index 3786e69..91294a8 100644
+index 1721f9b5..3d00961c 100644
 --- a/mt76_connac_mcu.h
 +++ b/mt76_connac_mcu.h
-@@ -1207,6 +1207,7 @@ enum {
+@@ -1209,6 +1209,7 @@ enum {
  	MCU_EXT_CMD_EDCA_UPDATE = 0x27,
  	MCU_EXT_CMD_DEV_INFO_UPDATE = 0x2A,
  	MCU_EXT_CMD_THERMAL_CTRL = 0x2c,
@@ -42,7 +42,7 @@
  	MCU_EXT_CMD_SET_DRR_CTRL = 0x36,
  	MCU_EXT_CMD_SET_FEATURE_CTRL = 0x38,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index e6e3152..8a07360 100644
+index 570dd171..8733a07d 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -4565,6 +4565,114 @@ int mt7915_mcu_get_tx_rate(struct mt7915_phy *phy, u16 wcidx)
@@ -161,7 +161,7 @@
  				struct cfg80211_he_bss_color *he_bss_color)
  {
 diff --git a/mt7915/mcu.h b/mt7915/mcu.h
-index 52baaa7..ec7ad7d 100644
+index 52baaa73..ec7ad7db 100644
 --- a/mt7915/mcu.h
 +++ b/mt7915/mcu.h
 @@ -854,7 +854,8 @@ mt7915_get_power_bound(struct mt7915_phy *phy, s8 txpower)
@@ -200,10 +200,10 @@
     CAPI_SU,
     CAPI_MU,
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index f5a7e1e..aafdafd 100644
+index 55af5c8c..731f5f3e 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -755,6 +755,7 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,
+@@ -770,6 +770,7 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,
  int mt7915_mcu_rdd_background_enable(struct mt7915_phy *phy,
  				     struct cfg80211_chan_def *chandef);
  int mt7915_mcu_wed_wa_tx_stats(struct mt7915_dev *dev, u16 wcid);
@@ -212,7 +212,7 @@
  int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3);
  int mt7915_mcu_fw_log_2_host(struct mt7915_dev *dev, u8 type, u8 ctrl);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 14ea5bc..c63bf90 100644
+index d6e92b12..d64a3aec 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -4027,6 +4027,66 @@ mt7915_sr_scene_cond_show(struct seq_file *file, void *data)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2007-wifi-mt76-mt7915-add-ctxd-support-for-mt7916.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2007-wifi-mt76-mt7915-add-ctxd-support-for-mt7916.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2007-wifi-mt76-mt7915-add-ctxd-support-for-mt7916.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2007-wifi-mt76-mt7915-add-ctxd-support-for-mt7916.patch
index 4f182ca..8052770 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2007-wifi-mt76-mt7915-add-ctxd-support-for-mt7916.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2007-wifi-mt76-mt7915-add-ctxd-support-for-mt7916.patch
@@ -1,4 +1,4 @@
-From c6929b147d890eeef315aabfd868860e1b8d3288 Mon Sep 17 00:00:00 2001
+From fac0ee814e10b01fc8536f4da0e2e7cec474b5d7 Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Thu, 6 Apr 2023 17:50:52 +0800
 Subject: [PATCH 2007/2015] wifi: mt76: mt7915: add ctxd support for mt7916
@@ -10,7 +10,7 @@
  2 files changed, 35 insertions(+)
 
 diff --git a/mt7915/dma.c b/mt7915/dma.c
-index 552410a..4f9f5a3 100644
+index 552410aa..4f9f5a38 100644
 --- a/mt7915/dma.c
 +++ b/mt7915/dma.c
 @@ -435,6 +435,26 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
@@ -41,7 +41,7 @@
  	} else {
  		mt76_clear(dev, MT_WFDMA_HOST_CONFIG, MT_WFDMA_HOST_CONFIG_WED);
 diff --git a/mt7915/regs.h b/mt7915/regs.h
-index ca355d1..d4acefc 100644
+index ca355d14..d4acefca 100644
 --- a/mt7915/regs.h
 +++ b/mt7915/regs.h
 @@ -607,6 +607,7 @@ enum offs_rev {
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2008-wifi-mt76-connac-wed-add-wed-rx-copy-skb.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2008-wifi-mt76-connac-wed-add-wed-rx-copy-skb.patch
similarity index 97%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2008-wifi-mt76-connac-wed-add-wed-rx-copy-skb.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2008-wifi-mt76-connac-wed-add-wed-rx-copy-skb.patch
index c96e9cc..6705920 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2008-wifi-mt76-connac-wed-add-wed-rx-copy-skb.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2008-wifi-mt76-connac-wed-add-wed-rx-copy-skb.patch
@@ -1,4 +1,4 @@
-From 0e3c9337e58e45f3e2ec3a00692dedc994c1bac8 Mon Sep 17 00:00:00 2001
+From cfad406a8e50de85347861782835596f599bfe59 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Sun, 4 Feb 2024 17:52:44 +0800
 Subject: [PATCH 2008/2015] wifi: mt76: connac: wed: add wed rx copy skb
@@ -10,7 +10,7 @@
  2 files changed, 80 insertions(+), 28 deletions(-)
 
 diff --git a/dma.c b/dma.c
-index 9cd97d2..d17fc88 100644
+index 9cd97d24..d17fc88c 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -225,10 +225,10 @@ void mt76_dma_queue_reset(struct mt76_dev *dev, struct mt76_queue *q)
@@ -138,7 +138,7 @@
  
  static void
 diff --git a/wed.c b/wed.c
-index c03b52f..70e4057 100644
+index c03b52f9..70e40575 100644
 --- a/wed.c
 +++ b/wed.c
 @@ -9,12 +9,9 @@
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2009-wifi-mt76-mt7915-enable-wa-log-to-uart.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2009-wifi-mt76-mt7915-enable-wa-log-to-uart.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2009-wifi-mt76-mt7915-enable-wa-log-to-uart.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2009-wifi-mt76-mt7915-enable-wa-log-to-uart.patch
index 14ad66b..730a493 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2009-wifi-mt76-mt7915-enable-wa-log-to-uart.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2009-wifi-mt76-mt7915-enable-wa-log-to-uart.patch
@@ -1,4 +1,4 @@
-From fc34c39c5e3484ab7d438dd0f5a701c5256cc643 Mon Sep 17 00:00:00 2001
+From 3be6f92d47cdfd1ab676c9728cc84560fd2cee91 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Fri, 8 Sep 2023 18:26:21 +0800
 Subject: [PATCH 2009/2015] wifi: mt76: mt7915: enable wa log to uart
@@ -9,7 +9,7 @@
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 3ae4aca..76d1951 100644
+index 576ec1a5..03ccb51b 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
 @@ -951,7 +951,11 @@ mt7915_fw_debug_wa_set(void *data, u64 val)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2010-wifi-mt76-mt7915-add-error-message-when-driver-recei.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2010-wifi-mt76-mt7915-add-error-message-when-driver-recei.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2010-wifi-mt76-mt7915-add-error-message-when-driver-recei.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2010-wifi-mt76-mt7915-add-error-message-when-driver-recei.patch
index 616fa20..8bccb66 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2010-wifi-mt76-mt7915-add-error-message-when-driver-recei.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2010-wifi-mt76-mt7915-add-error-message-when-driver-recei.patch
@@ -1,4 +1,4 @@
-From 2cdf9a78e39cbb91519b09393ea438c49df5b594 Mon Sep 17 00:00:00 2001
+From 24b3e43ac4d858dd17013087e4ea0b4b86002079 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Fri, 8 Sep 2023 18:29:32 +0800
 Subject: [PATCH 2010/2015] wifi: mt76: mt7915: add error message when driver
@@ -10,7 +10,7 @@
  1 file changed, 6 insertions(+)
 
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 1c8b873..3f907e6 100644
+index 1c8b8732..3f907e61 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1007,6 +1007,12 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2011-wifi-mt76-mt7915-wed-change-wed-token-init-size-to-a.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2011-wifi-mt76-mt7915-wed-change-wed-token-init-size-to-a.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2011-wifi-mt76-mt7915-wed-change-wed-token-init-size-to-a.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2011-wifi-mt76-mt7915-wed-change-wed-token-init-size-to-a.patch
index 54bdd75..21e6647 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2011-wifi-mt76-mt7915-wed-change-wed-token-init-size-to-a.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2011-wifi-mt76-mt7915-wed-change-wed-token-init-size-to-a.patch
@@ -1,4 +1,4 @@
-From a21e557d571d24801dbc7ebd403cefaec0b30f02 Mon Sep 17 00:00:00 2001
+From a1da16a0e8de7d47d6dbd43e2e677edd6285387a Mon Sep 17 00:00:00 2001
 From: "sujuan.chen" <sujuan.chen@mediatek.com>
 Date: Mon, 11 Sep 2023 17:57:32 +0800
 Subject: [PATCH 2011/2015] wifi: mt76: mt7915: wed: change wed token init size
@@ -16,7 +16,7 @@
  7 files changed, 33 insertions(+), 26 deletions(-)
 
 diff --git a/mt76.h b/mt76.h
-index 0ab1d74..5bf6ba6 100644
+index 7100934a..07dc6b34 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -29,6 +29,8 @@
@@ -29,7 +29,7 @@
  #define MT_QFLAG_WED_TYPE	GENMASK(4, 2)
  #define MT_QFLAG_WED		BIT(5)
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 3f907e6..02f794d 100644
+index 3f907e61..02f794d4 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -940,7 +940,7 @@ mt7915_mac_tx_free(struct mt7915_dev *dev, void *data, int len)
@@ -64,7 +64,7 @@
  					msdu);
  
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 8a07360..708e7cd 100644
+index 8733a07d..e856f37f 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -2509,6 +2509,9 @@ mt7915_mcu_init_rx_airtime(struct mt7915_dev *dev)
@@ -89,7 +89,7 @@
  
  	return mt76_mcu_send_msg(&dev->mt76, MCU_WA_PARAM_CMD(SET), &req,
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 3391a94..6309dd9 100644
+index baf35a53..6ade056a 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -695,11 +695,14 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
@@ -119,7 +119,7 @@
  	ret = dma_set_mask(wed->dev, DMA_BIT_MASK(32));
  	if (ret)
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index aafdafd..945c82e 100644
+index 731f5f3e..61500841 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
 @@ -62,7 +62,9 @@
@@ -134,7 +134,7 @@
  #define MT7915_RX_TOKEN_SIZE		4096
  
 diff --git a/tx.c b/tx.c
-index 92afbf5..df2bb07 100644
+index 92afbf5d..df2bb07d 100644
 --- a/tx.c
 +++ b/tx.c
 @@ -828,7 +828,7 @@ int mt76_token_consume(struct mt76_dev *dev, struct mt76_txwi_cache **ptxwi,
@@ -189,7 +189,7 @@
  
  	if (dev->token_count < dev->token_size - MT76_TOKEN_FREE_THR &&
 diff --git a/wed.c b/wed.c
-index 70e4057..5ed681e 100644
+index 70e40575..5ed681ed 100644
 --- a/wed.c
 +++ b/wed.c
 @@ -118,7 +118,7 @@ int mt76_wed_offload_enable(struct mtk_wed_device *wed)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2012-wifi-mt76-mt7915-wed-add-per-bss-statistic-info.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2012-wifi-mt76-mt7915-wed-add-per-bss-statistic-info.patch
similarity index 91%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2012-wifi-mt76-mt7915-wed-add-per-bss-statistic-info.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2012-wifi-mt76-mt7915-wed-add-per-bss-statistic-info.patch
index 9b86205..7854dec 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2012-wifi-mt76-mt7915-wed-add-per-bss-statistic-info.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2012-wifi-mt76-mt7915-wed-add-per-bss-statistic-info.patch
@@ -1,7 +1,7 @@
-From 4e0a12871b8c134c99bd702f425c492ddc1f50b6 Mon Sep 17 00:00:00 2001
+From c9a8c7cdd9a5e042dc691fb70c24d4ee6832f297 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Wed, 1 Nov 2023 07:50:08 +0800
-Subject: [PATCH 1/5] wifi: mt76: mt7915: wed: add per bss statistic info
+Subject: [PATCH 2012/2015] wifi: mt76: mt7915: wed: add per bss statistic info
 
 ---
  mt7915/init.c        |  1 +
@@ -14,10 +14,10 @@
  7 files changed, 81 insertions(+), 7 deletions(-)
 
 diff --git a/mt7915/init.c b/mt7915/init.c
-index f38c8a1..7bc8039 100644
+index 7f210669..26dc1a7a 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -400,6 +400,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
+@@ -401,6 +401,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy)
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_DISCOVERY);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT);
  	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);
@@ -26,7 +26,7 @@
  	if (!is_mt7915(&dev->mt76))
  		wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR);
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 02f794d..0c12170 100644
+index 02f794d4..0c121700 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1071,6 +1071,7 @@ static void mt7915_mac_add_txs(struct mt7915_dev *dev, void *data)
@@ -79,10 +79,10 @@
  		spin_lock_bh(&phy->stats_lock);
  	}
 diff --git a/mt7915/main.c b/mt7915/main.c
-index feb2c89..722635e 100644
+index ecfd9307..802d9e6f 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
-@@ -1219,6 +1219,9 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
+@@ -1231,6 +1231,9 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
  	struct rate_info *txrate = &msta->wcid.rate;
  	struct rate_info rxrate = {};
  
@@ -92,7 +92,7 @@
  	if (is_connac_v2(&phy->dev->mt76) &&
  	    !mt7915_mcu_get_rx_rate(phy, vif, sta, &rxrate)) {
  		sinfo->rxrate = rxrate;
-@@ -1247,7 +1250,7 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
+@@ -1259,7 +1262,7 @@ static void mt7915_sta_statistics(struct ieee80211_hw *hw,
  		sinfo->tx_bytes = msta->wcid.stats.tx_bytes;
  		sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES64);
  
@@ -102,7 +102,7 @@
  			sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS);
  		}
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 708e7cd..342fe42 100644
+index e856f37f..a1b4afee 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -4750,7 +4750,8 @@ int mt7915_mcu_twt_agrt_update(struct mt7915_dev *dev,
@@ -153,7 +153,7 @@
  out:
  	dev_kfree_skb(skb);
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 6309dd9..142f308 100644
+index 6ade056a..ab807369 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -592,7 +592,7 @@ static void mt7915_mmio_wed_update_rx_stats(struct mtk_wed_device *wed,
@@ -199,10 +199,10 @@
  }
  
 diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h
-index 945c82e..6e7ed9e 100644
+index 61500841..5e7b7ebe 100644
 --- a/mt7915/mt7915.h
 +++ b/mt7915/mt7915.h
-@@ -756,7 +756,8 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,
+@@ -771,7 +771,8 @@ int mt7915_mcu_get_rx_rate(struct mt7915_phy *phy, struct ieee80211_vif *vif,
  			   struct ieee80211_sta *sta, struct rate_info *rate);
  int mt7915_mcu_rdd_background_enable(struct mt7915_phy *phy,
  				     struct cfg80211_chan_def *chandef);
@@ -213,7 +213,7 @@
  int mt7915_mcu_rf_regval(struct mt7915_dev *dev, u32 regidx, u32 *val, bool set);
  int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3);
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index c63bf90..2c9f198 100644
+index d64a3aec..c4eb7368 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -4034,7 +4034,7 @@ static int mt7915_reset_counter(void *data, u64 val)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2013-wifi-mt76-add-debugfs-for-tx-drop-counters.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2013-wifi-mt76-add-debugfs-for-tx-drop-counters.patch
similarity index 95%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2013-wifi-mt76-add-debugfs-for-tx-drop-counters.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2013-wifi-mt76-add-debugfs-for-tx-drop-counters.patch
index 8cb87e0..19fb831 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2013-wifi-mt76-add-debugfs-for-tx-drop-counters.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2013-wifi-mt76-add-debugfs-for-tx-drop-counters.patch
@@ -1,7 +1,7 @@
-From d58cdc551155267c9c57606b0f8098dbcfbb75fc Mon Sep 17 00:00:00 2001
+From 86545609cc73f064e34e6783175b502623e08217 Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Mon, 18 Mar 2024 14:16:34 +0800
-Subject: [PATCH 1/4] wifi: mt76: add debugfs for tx drop counters
+Subject: [PATCH 2013/2015] wifi: mt76: add debugfs for tx drop counters
 
 Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
 ---
@@ -13,7 +13,7 @@
  5 files changed, 99 insertions(+), 8 deletions(-)
 
 diff --git a/dma.c b/dma.c
-index d17fc88..da3e8bc 100644
+index d17fc88c..da3e8bc3 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -612,13 +612,18 @@ mt76_dma_tx_queue_skb(struct mt76_phy *phy, struct mt76_queue *q,
@@ -96,7 +96,7 @@
  }
  
 diff --git a/mt76.h b/mt76.h
-index da5875f..2d59091 100644
+index 07dc6b34..08f1a7ce 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -849,6 +849,27 @@ struct mt76_vif {
@@ -136,7 +136,7 @@
  
  struct mt76_dev {
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 0c12170..1e2ef8c 100644
+index 0c121700..1e2ef8c0 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -782,9 +782,15 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
@@ -176,7 +176,7 @@
  	t->jiffies = jiffies;
  
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 2c9f198..1b2fbf9 100644
+index c4eb7368..abb09b76 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -4033,6 +4033,12 @@ static int mt7915_reset_counter(void *data, u64 val)
@@ -239,7 +239,7 @@
 +
  #endif
 diff --git a/tx.c b/tx.c
-index df2bb07..e4eb74b 100644
+index df2bb07d..e4eb74b7 100644
 --- a/tx.c
 +++ b/tx.c
 @@ -330,8 +330,10 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta,
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2014-wifi-mt76-add-debugfs-for-rx-drop-counters.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2014-wifi-mt76-add-debugfs-for-rx-drop-counters.patch
similarity index 96%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2014-wifi-mt76-add-debugfs-for-rx-drop-counters.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2014-wifi-mt76-add-debugfs-for-rx-drop-counters.patch
index 8668aaf..248ddd3 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2014-wifi-mt76-add-debugfs-for-rx-drop-counters.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2014-wifi-mt76-add-debugfs-for-rx-drop-counters.patch
@@ -1,7 +1,7 @@
-From dd3b663524af8f38dc1e2a04e1722f5b7d96d514 Mon Sep 17 00:00:00 2001
+From 8c618a9481eb07cd9699cb6266d34b6fd485f44a Mon Sep 17 00:00:00 2001
 From: Peter Chiu <chui-hao.chiu@mediatek.com>
 Date: Thu, 23 May 2024 02:33:47 +0800
-Subject: [PATCH 2/4] wifi: mt76: add debugfs for rx drop counters
+Subject: [PATCH 2014/2015] wifi: mt76: add debugfs for rx drop counters
 
 Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com>
 ---
@@ -15,7 +15,7 @@
  7 files changed, 140 insertions(+), 13 deletions(-)
 
 diff --git a/agg-rx.c b/agg-rx.c
-index 07c386c..97a963a 100644
+index 07c386c7..97a963ad 100644
 --- a/agg-rx.c
 +++ b/agg-rx.c
 @@ -151,6 +151,7 @@ void mt76_rx_aggr_reorder(struct sk_buff *skb, struct sk_buff_head *frames)
@@ -52,7 +52,7 @@
  	}
  
 diff --git a/dma.c b/dma.c
-index da3e8bc..782463f 100644
+index da3e8bc3..782463f6 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -251,13 +251,16 @@ mt76_dma_add_rx_buf(struct mt76_dev *dev, struct mt76_queue *q,
@@ -158,7 +158,7 @@
  		skb_reserve(skb, q->buf_offset);
  
 diff --git a/dma.h b/dma.h
-index 619dc0f..6b2ee7e 100644
+index 619dc0fe..6b2ee7ec 100644
 --- a/dma.h
 +++ b/dma.h
 @@ -92,27 +92,29 @@ mt76_dma_reset_tx_queue(struct mt76_dev *dev, struct mt76_queue *q)
@@ -198,7 +198,7 @@
  
  #endif
 diff --git a/mac80211.c b/mac80211.c
-index c31d130..6980fe7 100644
+index e50c68f8..e01ce59a 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -775,6 +775,7 @@ static void mt76_rx_release_amsdu(struct mt76_phy *phy, enum mt76_rxq_id q)
@@ -236,7 +236,7 @@
  
  static void
 diff --git a/mt76.h b/mt76.h
-index 2d59091..11898b8 100644
+index 08f1a7ce..32327d3b 100644
 --- a/mt76.h
 +++ b/mt76.h
 @@ -175,6 +175,33 @@ enum mt76_dfs_state {
@@ -305,7 +305,7 @@
  
  struct mt76_dev {
 diff --git a/mt7915/mac.c b/mt7915/mac.c
-index 1e2ef8c..195b5f6 100644
+index 1e2ef8c0..195b5f62 100644
 --- a/mt7915/mac.c
 +++ b/mt7915/mac.c
 @@ -1175,9 +1175,11 @@ void mt7915_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
@@ -342,7 +342,7 @@
  		break;
  	}
 diff --git a/mt7915/mtk_debugfs.c b/mt7915/mtk_debugfs.c
-index 1b2fbf9..a33a90d 100644
+index abb09b76..5413291a 100644
 --- a/mt7915/mtk_debugfs.c
 +++ b/mt7915/mtk_debugfs.c
 @@ -4032,9 +4032,12 @@ static int mt7915_reset_counter(void *data, u64 val)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/2015-wifi-mt76-mt7915-support-backaward-compatiable.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2015-wifi-mt76-mt7915-support-backaward-compatiable.patch
similarity index 88%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/2015-wifi-mt76-mt7915-support-backaward-compatiable.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2015-wifi-mt76-mt7915-support-backaward-compatiable.patch
index c7c6707..fbca3a6 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/2015-wifi-mt76-mt7915-support-backaward-compatiable.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/2015-wifi-mt76-mt7915-support-backaward-compatiable.patch
@@ -1,7 +1,7 @@
-From eebe902614c5e2759492afcd1f84665d241077cb Mon Sep 17 00:00:00 2001
+From fd382c52114f01db7d28f60b3e8917b4c9dfd301 Mon Sep 17 00:00:00 2001
 From: Rex Lu <rex.lu@mediatek.com>
 Date: Mon, 11 Dec 2023 19:21:16 +0800
-Subject: [PATCH 3/4] wifi: mt76: mt7915: support backaward compatiable
+Subject: [PATCH 2015/2015] wifi: mt76: mt7915: support backaward compatiable
 
 ---
  mt7915/mmio.c | 4 ++--
@@ -9,7 +9,7 @@
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/mt7915/mmio.c b/mt7915/mmio.c
-index 142f308..11db3ed 100644
+index ab807369..1ea91676 100644
 --- a/mt7915/mmio.c
 +++ b/mt7915/mmio.c
 @@ -697,7 +697,7 @@ int mt7915_mmio_wed_init(struct mt7915_dev *dev, void *pdev_ptr,
@@ -31,7 +31,7 @@
  
  	wed->wlan.nbuf = is_mt7915(&dev->mt76) ?
 diff --git a/wed.c b/wed.c
-index 5ed681e..652f59e 100644
+index 5ed681ed..652f59e1 100644
 --- a/wed.c
 +++ b/wed.c
 @@ -175,7 +175,7 @@ int mt76_wed_dma_setup(struct mt76_dev *dev, struct mt76_queue *q, bool reset)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/patches/9999-mt76-revert-for-backports-5.15-wireless-stack.patch b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/9999-mt76-revert-for-backports-5.15-wireless-stack.patch
similarity index 92%
rename from autobuild_mac80211_release/package/kernel/mt76/patches/9999-mt76-revert-for-backports-5.15-wireless-stack.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/9999-mt76-revert-for-backports-5.15-wireless-stack.patch
index 976378d..7e7fe6f 100644
--- a/autobuild_mac80211_release/package/kernel/mt76/patches/9999-mt76-revert-for-backports-5.15-wireless-stack.patch
+++ b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/patches/9999-mt76-revert-for-backports-5.15-wireless-stack.patch
@@ -1,32 +1,32 @@
-From b797380172c9191f7de318ee2db475583d67ed0d Mon Sep 17 00:00:00 2001
+From 1d910139c69d3baae9937d8416bc172bcd07d160 Mon Sep 17 00:00:00 2001
 From: Evelyn Tsai <evelyn.tsai@mediatek.com>
 Date: Wed, 5 Apr 2023 08:29:19 +0800
-Subject: [PATCH 4/4] mt76: revert for backports-5.15 wireless stack
+Subject: [PATCH] mt76: revert for backports-5.15 wireless stack
 
 wifi: mt76: mt7915: add support for he ldpc control from hostapd
 wifi: mt76: only include mt76_connac3_mac for WiFi7 chipsets
 ---
  Makefile          |   6 +-
  dma.c             |   2 +-
- mac80211.c        |  15 +--
+ mac80211.c        |  19 ++--
  mt7615/dma.c      |   4 +-
  mt7615/main.c     |   6 +-
- mt7615/mcu.c      |   8 +-
+ mt7615/mcu.c      |   6 +-
  mt76_connac_mac.c |   2 +-
  mt76_connac_mcu.c | 119 ++++++++++------------
  mt76x02_mac.c     |   6 +-
  mt7915/debugfs.c  |   4 +-
  mt7915/dma.c      |   4 +-
- mt7915/init.c     |   3 +-
- mt7915/main.c     |  36 ++-----
- mt7915/mcu.c      | 246 ++++++++++++++++++++++++++++++----------------
+ mt7915/init.c     |  12 ++-
+ mt7915/main.c     |  40 ++------
+ mt7915/mcu.c      | 252 ++++++++++++++++++++++++++++++----------------
  mt7915/testmode.c |   8 +-
- tx.c              |  22 ++---
+ tx.c              |  22 ++--
  wed.c             |   1 +
- 17 files changed, 265 insertions(+), 227 deletions(-)
+ 17 files changed, 275 insertions(+), 238 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 5352d00..073e37d 100644
+index 5352d000..073e37d7 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -31,7 +31,11 @@ mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \
@@ -43,7 +43,7 @@
  mt792x-lib-y := mt792x_core.o mt792x_mac.o mt792x_trace.o \
  		mt792x_debugfs.o mt792x_dma.o
 diff --git a/dma.c b/dma.c
-index 782463f..39fafce 100644
+index 782463f6..39fafce0 100644
 --- a/dma.c
 +++ b/dma.c
 @@ -1052,7 +1052,7 @@ mt76_dma_init(struct mt76_dev *dev,
@@ -56,7 +56,7 @@
  		napi_enable(&dev->napi[i]);
  	}
 diff --git a/mac80211.c b/mac80211.c
-index 6980fe7..e9c2dc2 100644
+index e01ce59a..a41bf2f9 100644
 --- a/mac80211.c
 +++ b/mac80211.c
 @@ -1062,14 +1062,9 @@ mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb,
@@ -77,16 +77,18 @@
  	status->rate_idx = mstat.rate_idx;
  	status->nss = mstat.nss;
  	status->band = mstat.band;
-@@ -1592,7 +1587,7 @@ EXPORT_SYMBOL_GPL(mt76_get_sar_power);
+@@ -1592,8 +1587,8 @@ EXPORT_SYMBOL_GPL(mt76_get_sar_power);
  static void
  __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
  {
--	if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif))
+-	if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif, 0))
+-		ieee80211_csa_finish(vif, 0);
 +	if (vif->csa_active && ieee80211_beacon_cntdwn_is_complete(vif))
- 		ieee80211_csa_finish(vif);
++		ieee80211_csa_finish(vif);
  }
  
-@@ -1614,7 +1609,7 @@ __mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif)
+ void mt76_csa_finish(struct mt76_dev *dev)
+@@ -1614,10 +1609,10 @@ __mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif)
  {
  	struct mt76_dev *dev = priv;
  
@@ -94,9 +96,13 @@
 +	if (!vif->csa_active)
  		return;
  
- 	dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif);
+-	dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif, 0);
++	dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif);
+ }
+ 
+ void mt76_csa_check(struct mt76_dev *dev)
 diff --git a/mt7615/dma.c b/mt7615/dma.c
-index e7135b2..6767c39 100644
+index e7135b2f..6767c39d 100644
 --- a/mt7615/dma.c
 +++ b/mt7615/dma.c
 @@ -282,8 +282,8 @@ int mt7615_dma_init(struct mt7615_dev *dev)
@@ -111,7 +117,7 @@
  
  	mt76_poll(dev, MT_WPDMA_GLO_CFG,
 diff --git a/mt7615/main.c b/mt7615/main.c
-index dab16b5..d32a752 100644
+index c27acaf0..1bdd703a 100644
 --- a/mt7615/main.c
 +++ b/mt7615/main.c
 @@ -473,7 +473,7 @@ static int mt7615_config(struct ieee80211_hw *hw, u32 changed)
@@ -142,18 +148,9 @@
  	if (changed & BSS_CHANGED_MU_GROUPS)
  		 mt7615_update_mu_group(hw, vif, info);
 diff --git a/mt7615/mcu.c b/mt7615/mcu.c
-index c9444c6..466f38e 100644
+index a9310660..c76594d6 100644
 --- a/mt7615/mcu.c
 +++ b/mt7615/mcu.c
-@@ -353,7 +353,7 @@ out:
- static void
- mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
- {
--	if (vif->bss_conf.csa_active)
-+	if (vif->csa_active)
- 		ieee80211_csa_finish(vif);
- }
- 
 @@ -699,7 +699,7 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev,
  	if (!enable)
  		goto out;
@@ -182,7 +179,7 @@
  		.bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int),
  	};
 diff --git a/mt76_connac_mac.c b/mt76_connac_mac.c
-index 21dadb5..fbad20e 100644
+index 21dadb55..fbad20ec 100644
 --- a/mt76_connac_mac.c
 +++ b/mt76_connac_mac.c
 @@ -1132,7 +1132,7 @@ void mt76_connac2_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi)
@@ -195,7 +192,7 @@
  
  	tid = le32_get_bits(txwi[1], MT_TXD1_TID);
 diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
-index 15e61c9..dd23643 100644
+index 0ce7ecdc..aee9b5bf 100644
 --- a/mt76_connac_mcu.c
 +++ b/mt76_connac_mcu.c
 @@ -199,7 +199,7 @@ int mt76_connac_mcu_set_vif_ps(struct mt76_dev *dev, struct ieee80211_vif *vif)
@@ -578,7 +575,7 @@
  	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD(OFFLOAD), true);
  }
 diff --git a/mt76x02_mac.c b/mt76x02_mac.c
-index d5db6ff..fec3d10 100644
+index d5db6ffd..fec3d10d 100644
 --- a/mt76x02_mac.c
 +++ b/mt76x02_mac.c
 @@ -404,7 +404,7 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
@@ -603,10 +600,10 @@
  		if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
  			ba_size = 0;
 diff --git a/mt7915/debugfs.c b/mt7915/debugfs.c
-index 76d1951..e22e777 100644
+index 03ccb51b..72867ff7 100644
 --- a/mt7915/debugfs.c
 +++ b/mt7915/debugfs.c
-@@ -2052,8 +2052,8 @@ static ssize_t mt7915_sta_fixed_rate_set(struct file *file,
+@@ -2100,8 +2100,8 @@ static ssize_t mt7915_sta_fixed_rate_set(struct file *file,
  
  	phy.ldpc = (phy.bw || phy.ldpc) * GENMASK(2, 0);
  	for (i = 0; i <= phy.bw; i++) {
@@ -618,7 +615,7 @@
  	field = RATE_PARAM_FIXED;
  
 diff --git a/mt7915/dma.c b/mt7915/dma.c
-index 4f9f5a3..fde6a38 100644
+index 4f9f5a38..fde6a385 100644
 --- a/mt7915/dma.c
 +++ b/mt7915/dma.c
 @@ -596,8 +596,8 @@ int mt7915_dma_init(struct mt7915_dev *dev, struct mt7915_phy *phy2)
@@ -633,10 +630,10 @@
  
  	mt7915_dma_enable(dev, false);
 diff --git a/mt7915/init.c b/mt7915/init.c
-index 7bc8039..f1cacc1 100644
+index 26dc1a7a..e8e3b94a 100644
 --- a/mt7915/init.c
 +++ b/mt7915/init.c
-@@ -1155,8 +1155,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
+@@ -1163,8 +1163,7 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band,
  			mt76_connac_gen_ppe_thresh(he_cap->ppe_thres, nss);
  		} else {
  			he_cap_elem->phy_cap_info[9] |=
@@ -646,11 +643,41 @@
  		}
  
  		if (band == NL80211_BAND_6GHZ) {
+@@ -1198,7 +1197,8 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy)
+ 		n = mt7915_init_he_caps(phy, NL80211_BAND_2GHZ, data);
+ 
+ 		band = &phy->mt76->sband_2g.sband;
+-		_ieee80211_set_sband_iftype_data(band, data, n);
++		band->iftype_data = data;
++		band->n_iftype_data = n;
+ 	}
+ 
+ 	if (phy->mt76->cap.has_5ghz) {
+@@ -1206,7 +1206,8 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy)
+ 		n = mt7915_init_he_caps(phy, NL80211_BAND_5GHZ, data);
+ 
+ 		band = &phy->mt76->sband_5g.sband;
+-		_ieee80211_set_sband_iftype_data(band, data, n);
++		band->iftype_data = data;
++		band->n_iftype_data = n;
+ 	}
+ 
+ 	if (phy->mt76->cap.has_6ghz) {
+@@ -1214,7 +1215,8 @@ void mt7915_set_stream_he_caps(struct mt7915_phy *phy)
+ 		n = mt7915_init_he_caps(phy, NL80211_BAND_6GHZ, data);
+ 
+ 		band = &phy->mt76->sband_6g.sband;
+-		_ieee80211_set_sband_iftype_data(band, data, n);
++		band->iftype_data = data;
++		band->n_iftype_data = n;
+ 	}
+ }
+ 
 diff --git a/mt7915/main.c b/mt7915/main.c
-index 722635e..98efaf8 100644
+index 802d9e6f..93120b9f 100644
 --- a/mt7915/main.c
 +++ b/mt7915/main.c
-@@ -548,7 +548,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
+@@ -551,7 +551,7 @@ static int mt7915_config(struct ieee80211_hw *hw, u32 changed)
  
  static int
  mt7915_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -659,7 +686,7 @@
  	       const struct ieee80211_tx_queue_params *params)
  {
  	struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
-@@ -650,7 +650,7 @@ mt7915_update_bss_color(struct ieee80211_hw *hw,
+@@ -653,7 +653,7 @@ mt7915_update_bss_color(struct ieee80211_hw *hw,
  static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
  				    struct ieee80211_vif *vif,
  				    struct ieee80211_bss_conf *info,
@@ -668,7 +695,7 @@
  {
  	struct mt7915_phy *phy = mt7915_hw_phy(hw);
  	struct mt7915_dev *dev = mt7915_hw_dev(hw);
-@@ -666,7 +666,7 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
+@@ -669,7 +669,7 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
  	    vif->type == NL80211_IFTYPE_STATION)
  		set_bss_info = set_sta = !is_zero_ether_addr(info->bssid);
  	if (changed & BSS_CHANGED_ASSOC)
@@ -677,7 +704,7 @@
  	if (changed & BSS_CHANGED_BEACON_ENABLED &&
  	    vif->type != NL80211_IFTYPE_AP)
  		set_bss_info = set_sta = info->enable_beacon;
-@@ -714,27 +714,8 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
+@@ -717,27 +717,8 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw,
  	mutex_unlock(&dev->mt76.mutex);
  }
  
@@ -706,7 +733,7 @@
  {
  	struct mt7915_phy *phy = mt7915_hw_phy(hw);
  	struct mt7915_dev *dev = mt7915_hw_dev(hw);
-@@ -742,8 +723,6 @@ mt7915_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+@@ -745,8 +726,6 @@ mt7915_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
  
  	mutex_lock(&dev->mt76.mutex);
  
@@ -715,7 +742,7 @@
  	err = mt7915_mcu_add_bss_info(phy, vif, true);
  	if (err)
  		goto out;
-@@ -755,8 +734,7 @@ out:
+@@ -758,8 +737,7 @@ out:
  }
  
  static void
@@ -725,7 +752,7 @@
  {
  	struct mt7915_dev *dev = mt7915_hw_dev(hw);
  
-@@ -1379,10 +1357,10 @@ static int mt7915_sta_set_txpwr(struct ieee80211_hw *hw,
+@@ -1391,10 +1369,10 @@ static int mt7915_sta_set_txpwr(struct ieee80211_hw *hw,
  {
  	struct mt7915_phy *phy = mt7915_hw_phy(hw);
  	struct mt7915_dev *dev = mt7915_hw_dev(hw);
@@ -738,8 +765,19 @@
  		txpower = 0;
  
  	mutex_lock(&dev->mt76.mutex);
+@@ -1885,10 +1863,6 @@ mt7915_net_fill_receive_path(struct ieee80211_hw *hw,
+ #endif
+ 
+ const struct ieee80211_ops mt7915_ops = {
+-	.add_chanctx = ieee80211_emulate_add_chanctx,
+-	.remove_chanctx = ieee80211_emulate_remove_chanctx,
+-	.change_chanctx = ieee80211_emulate_change_chanctx,
+-	.switch_vif_chanctx = ieee80211_emulate_switch_vif_chanctx,
+ 	.tx = mt7915_tx,
+ 	.start = mt7915_start,
+ 	.stop = mt7915_stop,
 diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 7a67b52..34ea5bf 100644
+index a1b4afee..2c5943b4 100644
 --- a/mt7915/mcu.c
 +++ b/mt7915/mcu.c
 @@ -67,7 +67,7 @@ mt7915_mcu_set_sta_he_mcs(struct ieee80211_sta *sta, __le16 *he_mcs,
@@ -793,7 +831,7 @@
  }
  
  static int
-@@ -243,7 +243,7 @@ int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)
+@@ -243,10 +243,10 @@ int mt7915_mcu_wa_cmd(struct mt7915_dev *dev, int cmd, u32 a1, u32 a2, u32 a3)
  static void
  mt7915_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
  {
@@ -801,7 +839,11 @@
 +	if (!vif->csa_active || vif->type == NL80211_IFTYPE_STATION)
  		return;
  
+-	ieee80211_csa_finish(vif, 0);
++	ieee80211_csa_finish(vif);
+ }
+ 
- 	ieee80211_csa_finish(vif);
+ static void
 @@ -349,7 +349,7 @@ mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)
  static void
  mt7915_mcu_cca_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
@@ -811,6 +853,19 @@
  		return;
  
  	ieee80211_color_change_finish(vif);
+@@ -681,10 +681,10 @@ static bool mt7915_check_he_obss_narrow_bw_ru(struct ieee80211_hw *hw,
+ 		.tolerated = true,
+ 	};
+ 
+-	if (!(vif->bss_conf.chanreq.oper.chan->flags & IEEE80211_CHAN_RADAR))
++	if (!(vif->bss_conf.chandef.chan->flags & IEEE80211_CHAN_RADAR))
+ 		return false;
+ 
+-	cfg80211_bss_iter(hw->wiphy, &vif->bss_conf.chanreq.oper,
++	cfg80211_bss_iter(hw->wiphy, &vif->bss_conf.chandef,
+ 			  mt7915_check_he_obss_narrow_bw_ru_iter,
+ 			  &iter_data);
+ 
 @@ -945,13 +945,13 @@ mt7915_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,
  		      struct ieee80211_vif *vif)
  {
@@ -1353,7 +1408,7 @@
  					len = sku_len[SKU_HE_RU242] * 4;
  				}
 diff --git a/mt7915/testmode.c b/mt7915/testmode.c
-index ecd6271..b2c442b 100644
+index ecd62712..b2c442b0 100644
 --- a/mt7915/testmode.c
 +++ b/mt7915/testmode.c
 @@ -418,12 +418,12 @@ mt7915_tm_entry_add(struct mt7915_phy *phy, u8 aid)
@@ -1374,7 +1429,7 @@
  	sta->wme = 1;
  
 diff --git a/tx.c b/tx.c
-index e4eb74b..a3654a9 100644
+index e4eb74b7..a3654a9b 100644
 --- a/tx.c
 +++ b/tx.c
 @@ -60,20 +60,15 @@ mt76_tx_status_unlock(struct mt76_dev *dev, struct sk_buff_head *list)
@@ -1430,7 +1485,7 @@
  		ieee80211_tx_status_ext(hw, &status);
  		spin_unlock_bh(&dev->rx_lock);
 diff --git a/wed.c b/wed.c
-index 652f59e..1c2ad30 100644
+index 652f59e1..1c2ad302 100644
 --- a/wed.c
 +++ b/wed.c
 @@ -80,6 +80,7 @@ u32 mt76_wed_init_rx_buf(struct mtk_wed_device *wed, int size)
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_eeprom_dbdc.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_rom_patch.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_rom_patch.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_rom_patch.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_rom_patch.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wa.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wa.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wa.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7915_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_eeprom.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_eeprom.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_eeprom.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_eeprom.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_rom_patch.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_rom_patch.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_rom_patch.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_rom_patch.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wa.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wa.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wa.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7916_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_eeprom_mt7976_dbdc.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_eeprom_mt7976_dbdc.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_eeprom_mt7976_dbdc.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_eeprom_mt7976_dbdc.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_rom_patch.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_rom_patch.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_rom_patch.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_rom_patch.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wa.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wa.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wa.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wo.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wo.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wo.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7981_wo.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975_dual.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975_dual.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975_dual.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7975_dual.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dbdc.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dbdc.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dbdc.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dbdc.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dual.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dual.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dual.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_eeprom_mt7976_dual.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch_mt7975.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch_mt7975.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch_mt7975.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_rom_patch_mt7975.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wa.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wa.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wa.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm_mt7975.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm_mt7975.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm_mt7975.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wm_mt7975.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_0.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_0.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_0.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_0.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_1.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_1.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_1.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7986_wo_1.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_23.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_23.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_23.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_dsp_23.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2e5e.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2i5i.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2i5i.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2i5i.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_23_2i5i.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2e5e.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5e.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5e.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5e.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5e.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5i.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5i.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5i.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_eeprom_2i5i.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_23.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_23.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_23.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_rom_patch_23.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_23.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_23.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_23.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wa_23.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_23.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_23.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_23.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_23.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_23.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_23.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_23.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7992_wm_tm_23.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_dsp.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_dsp.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_dsp.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_dsp.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_233.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_2i5i6i.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_2i5i6i.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_2i5i6i.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_2i5i6i.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_dual_404.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_dual_404.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_dual_404.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_eeprom_dual_404.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch_233.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch_233.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch_233.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_rom_patch_233.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa_233.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa_233.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa_233.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wa_233.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_233.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_233.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_233.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_233.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm_233.bin b/autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm_233.bin
similarity index 100%
rename from autobuild_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm_233.bin
rename to autobuild/autobuild_5.4_mac80211_release/package/kernel/mt76/src/firmware/mt7996/mt7996_wm_tm_233.bin
Binary files differ
diff --git a/autobuild_mac80211_release/package/network/config/netifd/Makefile b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/Makefile
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/Makefile
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/Makefile
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/etc/init.d/network b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/init.d/network
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/etc/init.d/network
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/init.d/network
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/etc/init.d/packet_steering b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/init.d/packet_steering
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/etc/init.d/packet_steering
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/init.d/packet_steering
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/uci-defaults/14_migrate-dhcp-release
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/etc/udhcpc.user b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/udhcpc.user
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/etc/udhcpc.user
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/etc/udhcpc.user
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/lib/netifd/dhcp.script b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/lib/netifd/dhcp.script
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/lib/netifd/dhcp.script
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/lib/netifd/dhcp.script
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/lib/network/config.sh b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/lib/network/config.sh
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/lib/network/config.sh
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/lib/network/config.sh
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/sbin/devstatus b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/devstatus
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/sbin/devstatus
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/devstatus
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/sbin/ifdown b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/ifdown
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/sbin/ifdown
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/ifdown
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/sbin/ifstatus b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/ifstatus
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/sbin/ifstatus
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/ifstatus
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/sbin/ifup b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/ifup
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/sbin/ifup
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/sbin/ifup
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/usr/libexec/network/packet-steering.sh b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/usr/libexec/network/packet-steering.sh
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/usr/libexec/network/packet-steering.sh
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/usr/libexec/network/packet-steering.sh
diff --git a/autobuild_mac80211_release/package/network/config/netifd/files/usr/share/udhcpc/default.script b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/usr/share/udhcpc/default.script
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/files/usr/share/udhcpc/default.script
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/files/usr/share/udhcpc/default.script
diff --git a/autobuild_mac80211_release/package/network/config/netifd/patches/0001-netifd-fix-disabling-radio-via-config-if-reconf-is-being.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/patches/0001-netifd-fix-disabling-radio-via-config-if-reconf-is-being.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/patches/0001-netifd-fix-disabling-radio-via-config-if-reconf-is-being.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/patches/0001-netifd-fix-disabling-radio-via-config-if-reconf-is-being.patch
diff --git a/autobuild_mac80211_release/package/network/config/netifd/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch
diff --git a/autobuild_mac80211_release/package/network/config/netifd/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch
diff --git a/autobuild_mac80211_release/package/network/config/netifd_new/patches/0001-netifd-revert-commit-can-t-work-for-Kernel5.4.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd_new/patches/0001-netifd-revert-commit-can-t-work-for-Kernel5.4.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd_new/patches/0001-netifd-revert-commit-can-t-work-for-Kernel5.4.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd_new/patches/0001-netifd-revert-commit-can-t-work-for-Kernel5.4.patch
diff --git a/autobuild_mac80211_release/package/network/config/netifd_new/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd_new/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd_new/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd_new/patches/mtk-0001-netifd-mtk-Fix-the-AP-sequence-is-out-of-order-when-.patch
diff --git a/autobuild_mac80211_release/package/network/config/netifd_new/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd_new/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/config/netifd_new/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/config/netifd_new/patches/mtk-0002-Add-sleep-to-prevent-for-ubus-race-condition.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/hostapd_v2.10_07730ff3.tar.gz b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/hostapd_v2.10_07730ff3.tar.gz
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/hostapd_v2.10_07730ff3.tar.gz
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/hostapd_v2.10_07730ff3.tar.gz
Binary files differ
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0001-ACS-Extract-bw40-80-160-freqs-out-of-acs_usable_bwXX.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0001-ACS-Extract-bw40-80-160-freqs-out-of-acs_usable_bwXX.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0001-ACS-Extract-bw40-80-160-freqs-out-of-acs_usable_bwXX.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0001-ACS-Extract-bw40-80-160-freqs-out-of-acs_usable_bwXX.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0002-ACS-Introduce-acs_get_bw_center_chan.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0002-ACS-Introduce-acs_get_bw_center_chan.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0002-ACS-Introduce-acs_get_bw_center_chan.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0002-ACS-Introduce-acs_get_bw_center_chan.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0003-ACS-introduce-acs_adjust_secondary.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0003-ACS-introduce-acs_adjust_secondary.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0003-ACS-introduce-acs_adjust_secondary.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0003-ACS-introduce-acs_adjust_secondary.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0004-ACS-Allow-selecting-a-better-channel-when-using-40-8.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0004-ACS-Allow-selecting-a-better-channel-when-using-40-8.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0004-ACS-Allow-selecting-a-better-channel-when-using-40-8.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0004-ACS-Allow-selecting-a-better-channel-when-using-40-8.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0005-PEAP-client-Update-Phase-2-authentication-requiremen.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0005-PEAP-client-Update-Phase-2-authentication-requiremen.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/bp-0005-PEAP-client-Update-Phase-2-authentication-requiremen.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/bp-0005-PEAP-client-Update-Phase-2-authentication-requiremen.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0001-hostapd-mtk-Add-neighbor-report-and-BSS-Termination-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0001-hostapd-mtk-Add-neighbor-report-and-BSS-Termination-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0001-hostapd-mtk-Add-neighbor-report-and-BSS-Termination-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0001-hostapd-mtk-Add-neighbor-report-and-BSS-Termination-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0002-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0002-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0002-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0002-hostapd-mtk-print-sae-groups-by-hostapd-ctrl.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0003-hostapd-mtk-add-support-for-runtime-set-in-band-disc.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0003-hostapd-mtk-add-support-for-runtime-set-in-band-disc.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0003-hostapd-mtk-add-support-for-runtime-set-in-band-disc.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0003-hostapd-mtk-add-support-for-runtime-set-in-band-disc.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0004-hostapd-mtk-Add-mtk_vendor.h.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0004-hostapd-mtk-Add-mtk_vendor.h.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0004-hostapd-mtk-Add-mtk_vendor.h.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0004-hostapd-mtk-Add-mtk_vendor.h.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0005-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0005-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0005-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0005-hostapd-mtk-Support-EDCCA-hostapd-configuration.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0006-hostapd-mtk-Add-hostapd-MU-SET-GET-control.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0007-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0007-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0007-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0007-hostapd-mtk-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0008-hostapd-mtk-Add-hostapd-iBF-control.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0008-hostapd-mtk-Add-hostapd-iBF-control.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0008-hostapd-mtk-Add-hostapd-iBF-control.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0008-hostapd-mtk-Add-hostapd-iBF-control.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0009-hostapd-mtk-Do-not-include-HE-capab-IE-if-associated.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0009-hostapd-mtk-Do-not-include-HE-capab-IE-if-associated.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0009-hostapd-mtk-Do-not-include-HE-capab-IE-if-associated.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0009-hostapd-mtk-Do-not-include-HE-capab-IE-if-associated.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0010-hostapd-mtk-Add-DFS-detection-mode.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0010-hostapd-mtk-Add-DFS-detection-mode.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0010-hostapd-mtk-Add-DFS-detection-mode.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0010-hostapd-mtk-Add-DFS-detection-mode.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0012-hostapd-mtk-Add-amsdu-set-get-ctrl.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0012-hostapd-mtk-Add-amsdu-set-get-ctrl.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0012-hostapd-mtk-Add-amsdu-set-get-ctrl.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0012-hostapd-mtk-Add-amsdu-set-get-ctrl.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0013-hostapd-mtk-Add-he_ldpc-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0013-hostapd-mtk-Add-he_ldpc-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0013-hostapd-mtk-Add-he_ldpc-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0013-hostapd-mtk-Add-he_ldpc-configuration.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0014-hostapd-mtk-Add-the-broadcast-destination-address-of.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0014-hostapd-mtk-Add-the-broadcast-destination-address-of.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0014-hostapd-mtk-Add-the-broadcast-destination-address-of.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0014-hostapd-mtk-Add-the-broadcast-destination-address-of.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0015-hostapd-mtk-Add-vendor-command-attribute-for-RTS-BW-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0015-hostapd-mtk-Add-vendor-command-attribute-for-RTS-BW-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0015-hostapd-mtk-Add-vendor-command-attribute-for-RTS-BW-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0015-hostapd-mtk-Add-vendor-command-attribute-for-RTS-BW-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0016-hostapd-mtk-6G-band-does-not-require-DFS.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0016-hostapd-mtk-6G-band-does-not-require-DFS.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0016-hostapd-mtk-6G-band-does-not-require-DFS.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0016-hostapd-mtk-6G-band-does-not-require-DFS.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0017-hostapd-mtk-Fix-sending-wrong-VHT-operation-IE-in-CS.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0017-hostapd-mtk-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0017-hostapd-mtk-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0017-hostapd-mtk-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0018-hostapd-mtk-Add-sta-assisted-DFS-state-update-mechan.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0018-hostapd-mtk-Add-sta-assisted-DFS-state-update-mechan.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0018-hostapd-mtk-Add-sta-assisted-DFS-state-update-mechan.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0018-hostapd-mtk-Add-sta-assisted-DFS-state-update-mechan.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0019-hostapd-mtk-Fix-auto-ht-issue-when-switching-to-DFS-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0019-hostapd-mtk-Fix-auto-ht-issue-when-switching-to-DFS-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0019-hostapd-mtk-Fix-auto-ht-issue-when-switching-to-DFS-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0019-hostapd-mtk-Fix-auto-ht-issue-when-switching-to-DFS-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0020-hostapd-mtk-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0020-hostapd-mtk-Mark-DFS-channel-as-available-for-CSA.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0020-hostapd-mtk-Mark-DFS-channel-as-available-for-CSA.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0020-hostapd-mtk-Mark-DFS-channel-as-available-for-CSA.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0021-hostapd-mtk-add-11v_mbss-and-ema-support-for-hostapd.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0021-hostapd-mtk-add-11v_mbss-and-ema-support-for-hostapd.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0021-hostapd-mtk-add-11v_mbss-and-ema-support-for-hostapd.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0021-hostapd-mtk-add-11v_mbss-and-ema-support-for-hostapd.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0022-hostapd-mtk-Add-available-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0022-hostapd-mtk-Add-available-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0022-hostapd-mtk-Add-available-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0022-hostapd-mtk-Add-available-color-bitmap.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0023-hostapd-mtk-Add-channel-information-for-hostapd-relo.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0023-hostapd-mtk-Add-channel-information-for-hostapd-relo.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0023-hostapd-mtk-Add-channel-information-for-hostapd-relo.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0023-hostapd-mtk-Add-channel-information-for-hostapd-relo.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0024-hostapd-mtk-Add-support-for-masking-EHT-capabilities.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0024-hostapd-mtk-Add-support-for-masking-EHT-capabilities.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0024-hostapd-mtk-Add-support-for-masking-EHT-capabilities.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0024-hostapd-mtk-Add-support-for-masking-EHT-capabilities.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0025-hostapd-mtk-Fix-ZWDFS-issue-in-BW-160.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0025-hostapd-mtk-Fix-ZWDFS-issue-in-BW-160.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0025-hostapd-mtk-Fix-ZWDFS-issue-in-BW-160.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0025-hostapd-mtk-Fix-ZWDFS-issue-in-BW-160.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0026-hostapd-mtk-Add-vendor-for-CAPI-certification-comman.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0026-hostapd-mtk-Add-vendor-for-CAPI-certification-comman.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0026-hostapd-mtk-Add-vendor-for-CAPI-certification-comman.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0026-hostapd-mtk-Add-vendor-for-CAPI-certification-comman.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0027-hostapd-mtk-Air-Monitor-support-in-hostapd-by-vendor.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0027-hostapd-mtk-Air-Monitor-support-in-hostapd-by-vendor.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0027-hostapd-mtk-Air-Monitor-support-in-hostapd-by-vendor.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0027-hostapd-mtk-Air-Monitor-support-in-hostapd-by-vendor.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0028-hostapd-mtk-Avoid-setting-beacon-after-wpa_supplican.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0028-hostapd-mtk-Avoid-setting-beacon-after-wpa_supplican.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0028-hostapd-mtk-Avoid-setting-beacon-after-wpa_supplican.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0028-hostapd-mtk-Avoid-setting-beacon-after-wpa_supplican.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0029-hostapd-mtk-Fix-scan-result-updating-issue.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0029-hostapd-mtk-Fix-scan-result-updating-issue.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0029-hostapd-mtk-Fix-scan-result-updating-issue.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0029-hostapd-mtk-Fix-scan-result-updating-issue.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0030-hostapd-mtk-Fix-setting-wrong-seg0-index-for-5G-cent.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0030-hostapd-mtk-Fix-setting-wrong-seg0-index-for-5G-cent.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0030-hostapd-mtk-Fix-setting-wrong-seg0-index-for-5G-cent.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0030-hostapd-mtk-Fix-setting-wrong-seg0-index-for-5G-cent.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0031-hostapd-mtk-Add-muru-user-number-debug-command.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0031-hostapd-mtk-Add-muru-user-number-debug-command.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0031-hostapd-mtk-Add-muru-user-number-debug-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0031-hostapd-mtk-Add-muru-user-number-debug-command.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0032-hostapd-mtk-Fix-CCA-issue.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0032-hostapd-mtk-Fix-CCA-issue.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0032-hostapd-mtk-Fix-CCA-issue.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0032-hostapd-mtk-Fix-CCA-issue.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0033-hostapd-mtk-Fix-unexpected-AP-beacon-state-transitio.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0033-hostapd-mtk-Fix-unexpected-AP-beacon-state-transitio.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0033-hostapd-mtk-Fix-unexpected-AP-beacon-state-transitio.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0033-hostapd-mtk-Fix-unexpected-AP-beacon-state-transitio.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0034-hostapd-mtk-Fix-hostapd_dfs_start_cac-log.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0034-hostapd-mtk-Fix-hostapd_dfs_start_cac-log.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0034-hostapd-mtk-Fix-hostapd_dfs_start_cac-log.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0034-hostapd-mtk-Fix-hostapd_dfs_start_cac-log.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0035-hostapd-mtk-add-extension-IE-list-for-non-inherit-IE.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0035-hostapd-mtk-add-extension-IE-list-for-non-inherit-IE.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0035-hostapd-mtk-add-extension-IE-list-for-non-inherit-IE.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0035-hostapd-mtk-add-extension-IE-list-for-non-inherit-IE.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-background-channel-overlapping-opera.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-background-channel-overlapping-opera.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-background-channel-overlapping-opera.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-background-channel-overlapping-opera.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-wpa_supplicant-configuration-parsing.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-wpa_supplicant-configuration-parsing.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-wpa_supplicant-configuration-parsing.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0036-hostapd-mtk-Fix-wpa_supplicant-configuration-parsing.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-Fix-11vmbss-aid-using-wrong-pool.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-Fix-11vmbss-aid-using-wrong-pool.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-Fix-11vmbss-aid-using-wrong-pool.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-Fix-11vmbss-aid-using-wrong-pool.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-add-back-ht-vht-cap-missing-field-before.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-add-back-ht-vht-cap-missing-field-before.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-add-back-ht-vht-cap-missing-field-before.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0037-hostapd-mtk-add-back-ht-vht-cap-missing-field-before.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0038-hostapd-mtk-Fix-rnr-ie-length-when-no-need-to-report.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0038-hostapd-mtk-Fix-rnr-ie-length-when-no-need-to-report.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0038-hostapd-mtk-Fix-rnr-ie-length-when-no-need-to-report.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0038-hostapd-mtk-Fix-rnr-ie-length-when-no-need-to-report.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0039-hostapd-mtk-avoid-color-switch-when-beacon-is-not-se.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0039-hostapd-mtk-avoid-color-switch-when-beacon-is-not-se.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0039-hostapd-mtk-avoid-color-switch-when-beacon-is-not-se.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0039-hostapd-mtk-avoid-color-switch-when-beacon-is-not-se.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0041-hostapd-mtk-6g-bss-connect-ignore-ht-opera.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0041-hostapd-mtk-6g-bss-connect-ignore-ht-opera.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0041-hostapd-mtk-6g-bss-connect-ignore-ht-opera.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0041-hostapd-mtk-6g-bss-connect-ignore-ht-opera.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0042-hostapd-mtk-avoid-unnecessary-beacon-update-for-6-GH.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0042-hostapd-mtk-avoid-unnecessary-beacon-update-for-6-GH.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0042-hostapd-mtk-avoid-unnecessary-beacon-update-for-6-GH.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0042-hostapd-mtk-avoid-unnecessary-beacon-update-for-6-GH.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0044-hostapd-mtk-Add-ACS-chanlist-info-in-get_config.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0044-hostapd-mtk-Add-ACS-chanlist-info-in-get_config.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0044-hostapd-mtk-Add-ACS-chanlist-info-in-get_config.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0044-hostapd-mtk-Add-ACS-chanlist-info-in-get_config.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0045-hostapd-mtk-add-log-in-extender-mode.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0045-hostapd-mtk-add-log-in-extender-mode.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0045-hostapd-mtk-add-log-in-extender-mode.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0045-hostapd-mtk-add-log-in-extender-mode.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0046-hostapd-mtk-ACS-Fix-2.4GHz-HT40-case-and-channel-swi.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0046-hostapd-mtk-ACS-Fix-2.4GHz-HT40-case-and-channel-swi.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0046-hostapd-mtk-ACS-Fix-2.4GHz-HT40-case-and-channel-swi.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0046-hostapd-mtk-ACS-Fix-2.4GHz-HT40-case-and-channel-swi.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-Check-the-bridge-after-ioctl-SIOCBRADDIF_new.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-Check-the-bridge-after-ioctl-SIOCBRADDIF_new.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-Check-the-bridge-after-ioctl-SIOCBRADDIF_new.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-Check-the-bridge-after-ioctl-SIOCBRADDIF_new.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0047-hostapd-mtk-add-support-for-channel-switching-to-dfs.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0048-hostapd-mtk-add-support-for-channel-switching-with-c.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0048-hostapd-mtk-add-support-for-channel-switching-with-c.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0048-hostapd-mtk-add-support-for-channel-switching-with-c.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0048-hostapd-mtk-add-support-for-channel-switching-with-c.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0049-hostapd-mtk-Add-DFS-offchan-channel-switch.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0049-hostapd-mtk-Add-DFS-offchan-channel-switch.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0049-hostapd-mtk-Add-DFS-offchan-channel-switch.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0049-hostapd-mtk-Add-DFS-offchan-channel-switch.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-Add-txpower-vendor-command.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-Add-txpower-vendor-command.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-Add-txpower-vendor-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-Add-txpower-vendor-command.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0050-hostapd-mtk-add-support-for-removeing-the-main-BSS.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-Update-Wide-Bandwidth-Channel-Switch-element.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-Update-Wide-Bandwidth-Channel-Switch-element.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-Update-Wide-Bandwidth-Channel-Switch-element.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-Update-Wide-Bandwidth-Channel-Switch-element.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0051-hostapd-mtk-add-support-for-enable-disable-single-BS.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0052-hostapd-mtk-ACS-remove-chan-freq-list-check-when-sca.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0053-hostapd-mtk-add-no_beacon-vendor-command-for-cert.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0054-hostapd-mtk-Add-support-for-gtk-rekeying-in-hostapd-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0054-hostapd-mtk-Add-support-for-gtk-rekeying-in-hostapd-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0054-hostapd-mtk-Add-support-for-gtk-rekeying-in-hostapd-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0054-hostapd-mtk-Add-support-for-gtk-rekeying-in-hostapd-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0055-hostapd-mtk-fix-failure-of-BSS-wise-QoS-map-setting.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0055-hostapd-mtk-fix-failure-of-BSS-wise-QoS-map-setting.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd/patches/mtk-0055-hostapd-mtk-fix-failure-of-BSS-wise-QoS-map-setting.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd/patches/mtk-0055-hostapd-mtk-fix-failure-of-BSS-wise-QoS-map-setting.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0001-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0001-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0001-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0001-mtk-hostapd-Add-neighbor-report-and-BSS-Termination-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0002-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0002-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0002-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0002-mtk-hostapd-print-sae-groups-by-hostapd-ctrl.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0003-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0003-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0003-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0003-mtk-hostapd-add-support-for-runtime-set-in-band-disc.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0004-mtk-hostapd-Add-mtk_vendor.h.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0004-mtk-hostapd-Add-mtk_vendor.h.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0004-mtk-hostapd-Add-mtk_vendor.h.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0004-mtk-hostapd-Add-mtk_vendor.h.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0005-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0005-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0005-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0005-mtk-hostapd-Support-EDCCA-hostapd-configuration.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0006-mtk-hostapd-Add-hostapd-MU-SET-GET-control.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0007-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0007-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0007-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0007-mtk-hostapd-Add-three-wire-PTA-ctrl-hostapd-vendor-c.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0008-mtk-hostapd-Add-hostapd-iBF-control.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0008-mtk-hostapd-Add-hostapd-iBF-control.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0008-mtk-hostapd-Add-hostapd-iBF-control.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0008-mtk-hostapd-Add-hostapd-iBF-control.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0009-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0009-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0009-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0009-mtk-hostapd-Do-not-include-HE-capab-IE-if-associated.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0010-mtk-hostapd-Add-DFS-detection-mode.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0010-mtk-hostapd-Add-DFS-detection-mode.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0010-mtk-hostapd-Add-DFS-detection-mode.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0010-mtk-hostapd-Add-DFS-detection-mode.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0011-mtk-hostapd-Add-DFS-offchan-channel-switch.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0011-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0011-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0011-mtk-hostapd-Add-DFS-offchan-channel-switch.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0012-mtk-hostapd-Add-amsdu-set-get-ctrl.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0012-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0012-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0012-mtk-hostapd-Add-amsdu-set-get-ctrl.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0013-mtk-hostapd-Add-he_ldpc-configuration.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0013-mtk-hostapd-Add-he_ldpc-configuration.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0013-mtk-hostapd-Add-he_ldpc-configuration.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0013-mtk-hostapd-Add-he_ldpc-configuration.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0014-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0014-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0014-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0014-mtk-hostapd-Add-vendor-command-attribute-for-RTS-BW-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0015-mtk-hostapd-6G-band-does-not-require-DFS.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0015-mtk-hostapd-6G-band-does-not-require-DFS.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0015-mtk-hostapd-6G-band-does-not-require-DFS.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0015-mtk-hostapd-6G-band-does-not-require-DFS.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0016-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0016-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0016-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0016-mtk-hostapd-Fix-sending-wrong-VHT-operation-IE-in-CS.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0017-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0017-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0017-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0017-mtk-hostapd-Add-sta-assisted-DFS-state-update-mechan.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0018-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0018-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0018-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0018-mtk-hostapd-Mark-DFS-channel-as-available-for-CSA.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0019-mtk-hostapd-Add-available-color-bitmap.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0019-mtk-hostapd-Add-available-color-bitmap.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0019-mtk-hostapd-Add-available-color-bitmap.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0019-mtk-hostapd-Add-available-color-bitmap.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0020-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0020-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0020-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0020-mtk-hostapd-Fix-ZWDFS-issue-in-BW-160.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0021-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0021-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0021-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0021-mtk-hostapd-Add-vendor-for-CAPI-certification-comman.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0022-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0022-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0022-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0022-mtk-hostapd-Air-Monitor-support-in-hostapd-by-vendor.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0023-mtk-hostapd-Fix-setting-wrong-seg0-index-for-5G-cent.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0023-mtk-hostapd-Fix-setting-wrong-seg0-index-for-5G-cent.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0023-mtk-hostapd-Fix-setting-wrong-seg0-index-for-5G-cent.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0023-mtk-hostapd-Fix-setting-wrong-seg0-index-for-5G-cent.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0024-mtk-hostapd-Add-muru-user-number-debug-command.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0024-mtk-hostapd-Add-muru-user-number-debug-command.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0024-mtk-hostapd-Add-muru-user-number-debug-command.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0024-mtk-hostapd-Add-muru-user-number-debug-command.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0025-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0025-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0025-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0025-mtk-hostapd-add-connac3-PHY-MURU-manual-mode-config-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0026-mtk-hostapd-Add-HE-capabilities-check.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0026-mtk-hostapd-Add-HE-capabilities-check.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0026-mtk-hostapd-Add-HE-capabilities-check.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0026-mtk-hostapd-Add-HE-capabilities-check.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0027-mtk-hostapd-Fix-background-channel-overlapping-opera.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0027-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0027-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0027-mtk-hostapd-Fix-background-channel-overlapping-opera.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0028-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0028-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0028-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0028-mtk-hostapd-Fix-hostapd_dfs_start_cac-log.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0029-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0029-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0029-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0029-mtk-hostapd-Check-the-bridge-after-ioctl-SIOCBRADDIF.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0030-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0030-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0030-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0030-mtk-hostapd-Update-parameter_set_count-in-MU-EDCA-IE.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0031-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0031-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0031-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0031-mtk-hostapd-add-extension-IE-list-for-non-inherit-IE.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0032-mtk-hostapd-Fix-rnr-ie-length-when-no-need-to-report.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0032-mtk-hostapd-Fix-rnr-ie-length-when-no-need-to-report.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0032-mtk-hostapd-Fix-rnr-ie-length-when-no-need-to-report.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0032-mtk-hostapd-Fix-rnr-ie-length-when-no-need-to-report.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0033-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0033-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0033-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0033-mtk-hostapd-add-back-ht-vht-cap-missing-field-before.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0034-mtk-hostapd-update-op_class-when-AP-channel-switchin.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0034-mtk-hostapd-update-op_class-when-AP-channel-switchin.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0034-mtk-hostapd-update-op_class-when-AP-channel-switchin.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0034-mtk-hostapd-update-op_class-when-AP-channel-switchin.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0035-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0035-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0035-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0035-mtk-hostapd-Add-support-for-gtk-rekeying-in-hostapd-.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0036-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0036-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0036-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0036-mtk-hostapd-Set-WMM-and-TX-queue-parameters-for-wpa_.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0037-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0037-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0037-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0037-mtk-hostapd-Set-STA-TX-queue-parameters-configuratio.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0038-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0038-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0038-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0038-mtk-hostapd-avoid-color-switch-when-beacon-is-not-se.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0039-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0039-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0039-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0039-mtk-hostapd-6g-bss-connect-do-not-consider-ht-operat.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0040-mtk-hostapd-avoid-unnecessary-beacon-update-for-6-GH.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0040-mtk-hostapd-avoid-unnecessary-beacon-update-for-6-GH.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0040-mtk-hostapd-avoid-unnecessary-beacon-update-for-6-GH.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0040-mtk-hostapd-avoid-unnecessary-beacon-update-for-6-GH.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0041-mtk-hostapd-refactor-the-flow-to-create-Wide-Bandwid.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0041-mtk-hostapd-refactor-the-flow-to-create-Wide-Bandwid.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0041-mtk-hostapd-refactor-the-flow-to-create-Wide-Bandwid.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0041-mtk-hostapd-refactor-the-flow-to-create-Wide-Bandwid.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0042-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0042-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0042-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0042-mtk-hostapd-Add-ACS-chanlist-info-in-get_config.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0043-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0043-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0043-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0043-mtk-hostapd-Fix-RSNXE-Interop-issue-with-STA.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0044-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0044-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0044-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0044-mtk-hostapd-Fix-chan_switch-to-usable-DFS-channel-fa.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0045-mtk-hostapd-update-eht-operation-element.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0045-mtk-hostapd-update-eht-operation-element.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0045-mtk-hostapd-update-eht-operation-element.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0045-mtk-hostapd-update-eht-operation-element.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0046-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0046-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0046-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0046-mtk-hostapd-ucode-add-support-for-ucode-to-parse-BW3.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0047-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0047-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0047-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0047-mtk-hostapd-synchronize-bandwidth-in-AP-STA-support.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0048-mtk-hostapd-Add-support-for-updating-background-chan.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0048-mtk-hostapd-Add-support-for-updating-background-chan.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0048-mtk-hostapd-Add-support-for-updating-background-chan.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0048-mtk-hostapd-Add-support-for-updating-background-chan.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0049-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0049-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0049-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0049-mtk-hostapd-add-zwdfs-mode-ctrl-for-eagle-efem-hwits.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0050-mtk-hostapd-add-support-enable-disable-preamble-punc.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0050-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0050-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0050-mtk-hostapd-add-support-enable-disable-preamble-punc.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0051-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0051-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0051-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0051-mtk-hostapd-add-no_beacon-vendor-command-for-cert.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0052-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0052-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0052-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0052-mtk-hostapd-ACS-Add-EHT320-and-HT40-support-fix-issu.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0053-mtk-hostapd-add-eht_bw320_offset-configuration-optio.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0053-mtk-hostapd-add-eht_bw320_offset-configuration-optio.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0053-mtk-hostapd-add-eht_bw320_offset-configuration-optio.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0053-mtk-hostapd-add-eht_bw320_offset-configuration-optio.patch
diff --git a/autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0054-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0054-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/services/hostapd_new/patches/mtk-0054-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/services/hostapd_new/patches/mtk-0054-mtk-hostapd-WPS-added-change-to-configure-AP-PIN-loc.patch
diff --git a/autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-for-5G-U-NII-3-6G-BW320.patch b/autobuild/autobuild_5.4_mac80211_release/package/network/utils/iw/patches/1000-Add-support-for-5G-U-NII-3-6G-BW320.patch
similarity index 100%
rename from autobuild_mac80211_release/package/network/utils/iw/patches/1000-Add-support-for-5G-U-NII-3-6G-BW320.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/network/utils/iw/patches/1000-Add-support-for-5G-U-NII-3-6G-BW320.patch
diff --git a/autobuild_mac80211_release/package/system/rpcd/patches/0001-rpcd-iwinfo-constify-string-map-arg-for-rpc_iwinfo_call_int.patch b/autobuild/autobuild_5.4_mac80211_release/package/system/rpcd/patches/0001-rpcd-iwinfo-constify-string-map-arg-for-rpc_iwinfo_call_int.patch
similarity index 100%
rename from autobuild_mac80211_release/package/system/rpcd/patches/0001-rpcd-iwinfo-constify-string-map-arg-for-rpc_iwinfo_call_int.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/system/rpcd/patches/0001-rpcd-iwinfo-constify-string-map-arg-for-rpc_iwinfo_call_int.patch
diff --git a/autobuild_mac80211_release/package/utils/ucode/patches/0001-change-cmakelist.patch b/autobuild/autobuild_5.4_mac80211_release/package/utils/ucode/patches/0001-change-cmakelist.patch
similarity index 100%
rename from autobuild_mac80211_release/package/utils/ucode/patches/0001-change-cmakelist.patch
rename to autobuild/autobuild_5.4_mac80211_release/package/utils/ucode/patches/0001-change-cmakelist.patch
diff --git a/autobuild_mac80211_release/target/linux/generic/backport-5.4/999-update-uapi-header-files-for-bridger.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/generic/backport-5.4/999-update-uapi-header-files-for-bridger.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/generic/backport-5.4/999-update-uapi-header-files-for-bridger.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/generic/backport-5.4/999-update-uapi-header-files-for-bridger.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/base-files/etc/init.d/pppq-ebl.init b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/base-files/etc/init.d/pppq-ebl.init
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/base-files/etc/init.d/pppq-ebl.init
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/base-files/etc/init.d/pppq-ebl.init
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3000-ovs-add-multicast-to-unicast-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3000-ovs-add-multicast-to-unicast-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3000-ovs-add-multicast-to-unicast-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3000-ovs-add-multicast-to-unicast-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mt7622-backport-nf-hw-offload-framework-and-upstream.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3002-dts-netsys2-wed-changes.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3002-dts-netsys2-wed-changes.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3002-dts-netsys2-wed-changes.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3002-dts-netsys2-wed-changes.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3003-add-wed.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3003-add-wed.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3003-add-wed.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3003-add-wed.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3004-ethernet-update-ppe-from-netsys1-to-netsys2.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3004-ethernet-update-ppe-from-netsys1-to-netsys2.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3004-ethernet-update-ppe-from-netsys1-to-netsys2.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3004-ethernet-update-ppe-from-netsys1-to-netsys2.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-flow-offload-add-mkhnat-dual-ppe-new-v2.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3006-add-wed-tx-support-for-netsys2.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3006-add-wed-tx-support-for-netsys2.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3006-add-wed-tx-support-for-netsys2.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3006-add-wed-tx-support-for-netsys2.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3007-add-wed-tx-wds-support-for-netsys2.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3007-add-wed-tx-wds-support-for-netsys2.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3007-add-wed-tx-wds-support-for-netsys2.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3007-add-wed-tx-wds-support-for-netsys2.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3008-add-wed-rx-support-for-netsys2.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3008-add-wed-rx-support-for-netsys2.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3008-add-wed-rx-support-for-netsys2.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3008-add-wed-rx-support-for-netsys2.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3009-add-wed-ser-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3010-ethernet-update-ppe-backward-compatible-two-way-hash.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3010-ethernet-update-ppe-backward-compatible-two-way-hash.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3010-ethernet-update-ppe-backward-compatible-two-way-hash.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3010-ethernet-update-ppe-backward-compatible-two-way-hash.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3011-flow-offload-add-mtkhnat-flow-accounting.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3011-flow-offload-add-mtkhnat-flow-accounting.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3011-flow-offload-add-mtkhnat-flow-accounting.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3011-flow-offload-add-mtkhnat-flow-accounting.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3012-flow-offload-add-mtkhnat-qdma-qos.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3012-flow-offload-add-mtkhnat-qdma-qos.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3012-flow-offload-add-mtkhnat-qdma-qos.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3012-flow-offload-add-mtkhnat-qdma-qos.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3013-flow-offload-ovs-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3013-flow-offload-ovs-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3013-flow-offload-ovs-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3013-flow-offload-ovs-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3014-update-net-bridge-for-bridger.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3015-ethernet-update-ppe-from-netsys2-to-netsys3.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3015-ethernet-update-ppe-from-netsys2-to-netsys3.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3015-ethernet-update-ppe-from-netsys2-to-netsys3.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3015-ethernet-update-ppe-from-netsys2-to-netsys3.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3016-mediatek-ethernet-add-wifi2wifi-offload-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3016-mediatek-ethernet-add-wifi2wifi-offload-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3016-mediatek-ethernet-add-wifi2wifi-offload-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3016-mediatek-ethernet-add-wifi2wifi-offload-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3017-flow-offload-add-mtkhnat-dscp.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3018-flow-offload-add-mtkhnat-netlink.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3018-flow-offload-add-mtkhnat-netlink.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3018-flow-offload-add-mtkhnat-netlink.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3018-flow-offload-add-mtkhnat-netlink.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3019-mtk-wed-add-wed3-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3019-mtk-wed-add-wed3-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3019-mtk-wed-add-wed3-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3019-mtk-wed-add-wed3-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3020-mtk-wed-add-wed3-ser-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3020-mtk-wed-add-wed3-ser-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3020-mtk-wed-add-wed3-ser-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3020-mtk-wed-add-wed3-ser-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3021-mtk-wed-add-dma-mask-limitation-and-GFP_DMA32-for-bo.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3021-mtk-wed-add-dma-mask-limitation-and-GFP_DMA32-for-bo.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3021-mtk-wed-add-dma-mask-limitation-and-GFP_DMA32-for-bo.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3021-mtk-wed-add-dma-mask-limitation-and-GFP_DMA32-for-bo.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3022-mediatek-ethernet-add-multiple-ppe-allocati.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3022-mediatek-ethernet-add-multiple-ppe-allocati.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3022-mediatek-ethernet-add-multiple-ppe-allocati.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3022-mediatek-ethernet-add-multiple-ppe-allocati.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3023-mtk-ppe-dispatch-short-packets-to-high-prio.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3023-mtk-ppe-dispatch-short-packets-to-high-prio.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3023-mtk-ppe-dispatch-short-packets-to-high-prio.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3023-mtk-ppe-dispatch-short-packets-to-high-prio.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3024-dts-88d-option-type-2-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3024-dts-88d-option-type-2-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3024-dts-88d-option-type-2-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3024-dts-88d-option-type-2-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3025-flow-offload-add-mtkhnat-roaming.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3025-flow-offload-add-mtkhnat-roaming.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3025-flow-offload-add-mtkhnat-roaming.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3025-flow-offload-add-mtkhnat-roaming.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3026-extended-wed-debugfs.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3026-extended-wed-debugfs.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3026-extended-wed-debugfs.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3026-extended-wed-debugfs.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3027-flow-offload-add-relayd-support.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3027-flow-offload-add-relayd-support.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3027-flow-offload-add-relayd-support.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3027-flow-offload-add-relayd-support.patch
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3099-flow-offload-binding-when-there-is-no-ARP.patch b/autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3099-flow-offload-binding-when-there-is-no-ARP.patch
similarity index 100%
rename from autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3099-flow-offload-binding-when-there-is-no-ARP.patch
rename to autobuild/autobuild_5.4_mac80211_release/target/linux/mediatek/patches-5.4/999-3099-flow-offload-binding-when-there-is-no-ARP.patch
diff --git a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0002-bp-sync-upstream-changes.patch b/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0002-bp-sync-upstream-changes.patch
deleted file mode 100644
index cc34f3c..0000000
--- a/autobuild_mac80211_release/mt7988_mt7996_mac80211_mlo/package/kernel/mt76/patches/0002-bp-sync-upstream-changes.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 33b7b4702d0666eb4e1535ea99bcf1f4316c2ab2 Mon Sep 17 00:00:00 2001
-From: Shayne Chen <shayne.chen@mediatek.com>
-Date: Thu, 21 Mar 2024 12:14:20 +0800
-Subject: [PATCH 002/116] bp: sync upstream changes
-
-Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
----
- mac80211.c   | 6 +++---
- mt7615/mcu.c | 2 +-
- mt7915/mcu.c | 2 +-
- mt7996/mcu.c | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/mac80211.c b/mac80211.c
-index 4871355..e4675bf 100644
---- a/mac80211.c
-+++ b/mac80211.c
-@@ -1614,8 +1614,8 @@ EXPORT_SYMBOL_GPL(mt76_get_sar_power);
- static void
- __mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
- {
--	if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif))
--		ieee80211_csa_finish(vif);
-+	if (vif->bss_conf.csa_active && ieee80211_beacon_cntdwn_is_complete(vif, 0))
-+		ieee80211_csa_finish(vif, 0);
- }
- 
- void mt76_csa_finish(struct mt76_dev *dev)
-@@ -1639,7 +1639,7 @@ __mt76_csa_check(void *priv, u8 *mac, struct ieee80211_vif *vif)
- 	if (!vif->bss_conf.csa_active)
- 		return;
- 
--	dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif);
-+	dev->csa_complete |= ieee80211_beacon_cntdwn_is_complete(vif, 0);
- }
- 
- void mt76_csa_check(struct mt76_dev *dev)
-diff --git a/mt7615/mcu.c b/mt7615/mcu.c
-index ae34d01..c807bd8 100644
---- a/mt7615/mcu.c
-+++ b/mt7615/mcu.c
-@@ -353,7 +353,7 @@ static void
- mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
- {
- 	if (vif->bss_conf.csa_active)
--		ieee80211_csa_finish(vif);
-+		ieee80211_csa_finish(vif, 0);
- }
- 
- static void
-diff --git a/mt7915/mcu.c b/mt7915/mcu.c
-index 29e9d66..fc194e0 100644
---- a/mt7915/mcu.c
-+++ b/mt7915/mcu.c
-@@ -228,7 +228,7 @@ mt7915_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
- 	if (!vif->bss_conf.csa_active || vif->type == NL80211_IFTYPE_STATION)
- 		return;
- 
--	ieee80211_csa_finish(vif);
-+	ieee80211_csa_finish(vif, 0);
- }
- 
- static void
-diff --git a/mt7996/mcu.c b/mt7996/mcu.c
-index 4588696..4bd74e1 100644
---- a/mt7996/mcu.c
-+++ b/mt7996/mcu.c
-@@ -341,7 +341,7 @@ mt7996_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)
- 	if (!vif->bss_conf.csa_active || vif->type == NL80211_IFTYPE_STATION)
- 		return;
- 
--	ieee80211_csa_finish(vif);
-+	ieee80211_csa_finish(vif, 0);
- }
- 
- static void
--- 
-2.18.0
-