ratelimit: fix rate limiting on WiFi-7 devices

Rate limiting was not applied on WiFi-7 devices because their
hostapd interface names use the phy* prefix instead of wlan*.
This patch extends the match pattern to include both wlan* and phy*.

Fixes: WIFI-14884

Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>

feeds/ipq807x_v5.4/ath11k-wifi/Makefile

@@ -24,6 +24,8 @@ endef
 #
 
 ALLWIFIBOARDS:= \
+	cig-wf186w \
+	cig-wf186h \
 	cig-wf660a \
 	cig-wf194c \
 	cig-wf194c4 \
@@ -106,16 +108,6 @@ $(call Package/ath11k-wifi-default)
     TITLE:=cig-wf196 bdf
 endef
 
-define Package/ath11k-wifi-cig-wf186w
-$(call Package/ath11k-wifi-default)
-    TITLE:=cig-wf186w bdf
-endef
-
-define Package/ath11k-wifi-cig-wf186h
-$(call Package/ath11k-wifi-default)
-    TITLE:=cig-wf186h bdf
-endef
-
 define Package/ath11k-wifi-gl-ax1800
 $(call Package/ath11k-wifi-default)
     TITLE:=gl-ax1800 bdf
@@ -292,24 +284,6 @@ define Package/ath11k-wifi-cig-wf196/install
 	$(INSTALL_DATA) ./board-cig-wf196-us.bin.IPQ8074 $(1)/lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.US
 endef
 
-define Package/ath11k-wifi-cig-wf186w/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
-	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
-	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
-endef
-
-define Package/ath11k-wifi-cig-wf186h/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
-	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
-	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
-endef
-
 define Package/ath11k-wifi-optimcloud-d50/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
@@ -419,6 +393,8 @@ define Package/ath11k-wifi-cig-wf188n/install
 	$(INSTALL_DATA) ./board-cig-wf188n-us.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US
 endef
 
+$(eval $(call generate-ath11k-wifi-package,cig-wf186w,Cigtech WF186w))
+$(eval $(call generate-ath11k-wifi-package,cig-wf186h,Cigtech WF186h))
 $(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
@@ -464,8 +440,6 @@ $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6018))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-qcn9000))
 $(eval $(call BuildPackage,ath11k-wifi-cig-wf196))
-$(eval $(call BuildPackage,ath11k-wifi-cig-wf186w))
-$(eval $(call BuildPackage,ath11k-wifi-cig-wf186h))
 $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d50))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d60))

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata

@@ -251,32 +251,6 @@ ath11k-macs)
 		;;
 	esac
 	;;
-ath11k/IPQ5018/hw1.0/board.bin)
-	case "$board" in
-	cig,wf186w|\
-	cig,wf186h)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
-                else
-                        ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
-                fi
-                ;;
-	esac
-	;;
-ath11k/qcn6122/hw1.0/board.bin)
-	case "$board" in
-	cig,wf186w|\
-	cig,wf186h)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
-                else
-                        ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
-                fi
-                ;;
-	esac
-	;;
 *)
 	exit 1
 	;;

feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-setting.patch

@@ -0,0 +1,107 @@
+# Description: The Mesh11sd daemon expects the mesh interface name to follow the format 'mesh<index>'. 
+# If it doesn't find this format, it attempts to set it in the UCI wireless configuration. 
+# However, when operating in other modes such as AP, STA, or Ad-Hoc, the script was patched to remove 
+# the mesh interface name from UCI. This process can lead to a race condition between the UI and Mesh11sd,
+# resulting in stale interface name values.
+# This patch resolves the issue by removing the setting of the interface name from the script, as it is 
+# now managed through the UI, ensuring consistency and eliminating the race condition.
+
+--- a/src/mesh11sd
++++ b/src/mesh11sd
+@@ -387,45 +387,45 @@ elif [ "$1" = "daemon" ]; then
+ 
+ 		if [ $mode -eq 5 ]; then
+ 			# startup=4, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 4 ]; then
+ 			# startup=4, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 3 ]; then
+ 			# startup=0, statusmode=2, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 2 ]; then
+ 			# startup=0, statusmode=2, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 1 ]; then
+ 			# startup=0, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 0 ]; then
+ 			# startup=0, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 		fi
+ 
+ 		if [ $mode -ne $lastmode ]; then
+@@ -441,26 +441,6 @@ elif [ "$1" = "daemon" ]; then
+ 			meshconfigs=$(uci show wireless 2> /dev/null | grep "mode='mesh'" | awk -F ".mode='mesh'" '{printf "%s " $1}')
+ 
+ 			if [ ! -z "$meshconfigs" ]; then
+-				for meshconfig in $meshconfigs; do
+-					ifname=$(uci get $meshconfig.ifname 2> /dev/null)
+-
+-					if [ -z "$ifname" ] || [ "$ifname" != "mesh$meshindex" ]; then
+-						# No interface name in config, so add one
+-						ucibatch="set $meshconfig.ifname='mesh$meshindex'"
+-						echo "$ucibatch" | uci batch
+-						changed=1
+-						syslogmessage="Setting mesh interface name to [ mesh$meshindex ]"
+-						write_to_syslog
+-					fi
+-					meshindex=$(($meshindex+1))
+-				done
+-
+-				if [ "$changed" -eq 1 ]; then
+-					changed=0
+-					restart_mesh
+-					continue
+-				fi
+-
+ 				# get a list of interfaces
+ 				get_mesh_iflist
+ 
+@@ -482,13 +462,13 @@ elif [ "$1" = "daemon" ]; then
+ 						# this is not a mesh interface
+ 						continue
+ 					else
+-						# Check if this interface has a uci ifname
+-						uciname=$(uci show wireless | grep "ifname='$iface'" | awk -F "." '{printf "wireless.%s" $2}')
++						# Check if this interface mode is 'mesh'
++						uciname=$(uci show wireless | grep "mode='mesh'" | awk -F "." '{printf "wireless.%s" $2}')
+ 
+ 						if [ -z "$uciname" ]; then
+-							# Error - No interface name in config, we should have added one
++							# Error - No interface with mode as mesh
+ 							debugtype="err"
+-							syslogmessage="Error getting mesh interface name"
++							syslogmessage="Error getting mesh interface section"
+ 							write_to_syslog
+ 							continue
+ 						fi

feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-upon-disable.patch

@@ -1,63 +0,0 @@
-# Description: The Mesh11sd daemon sets the interface name 'mesh<index>' to the mesh interface.
-# However, even after disabling the mesh mode, this interface name persists, leading to confusion
-# when operating in other modes like AP/STA/Ad-Hoc, where the interface name continues to display as 'mesh<idx>'.
-# This patch addresses the issue by removing the 'mesh<idx>' interface name from the configuration when the device
-# is no longer in mesh mode. As this modification is not present in the upstream version, it is necessary to apply
-# this local patch to resolve the inconsistency
-
-diff --git a/src/mesh11sd b/src/mesh11sd
-index 85041d3..5f50e97 100755
---- a/src/mesh11sd
-+++ b/src/mesh11sd
-@@ -387,45 +387,45 @@ elif [ "$1" = "daemon" ]; then
- 
- 		if [ $mode -eq 5 ]; then
- 			# startup=4, statusmode=0, enabled=1
-+			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 
- 		elif [ $mode -eq 4 ]; then
- 			# startup=4, statusmode=0, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 
- 		elif [ $mode -eq 3 ]; then
- 			# startup=0, statusmode=2, enabled=1
-+			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 
- 		elif [ $mode -eq 2 ]; then
- 			# startup=0, statusmode=2, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 
- 		elif [ $mode -eq 1 ]; then
- 			# startup=0, statusmode=0, enabled=1
-+			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
- 
- 		elif [ $mode -eq 0 ]; then
- 			# startup=0, statusmode=0, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 		fi
- 
- 		if [ $mode -ne $lastmode ]; then

feeds/morse/utils/morse_mesh11sd/patches/003-accton_fix_ifname_confliction.patch

@@ -1,39 +0,0 @@
---- a/src/mesh11sd	2024-09-06 17:13:52.075070001 +0800
-+++ b/src/mesh11sd	2024-09-06 17:47:36.326914438 +0800
-@@ -434,7 +434,6 @@
- 		fi
- 
- 		lastmode=$mode
--		meshindex=0
- 
- 		if [ "$enabled" = 1 ]; then
- 			#get list of mesh configs
-@@ -443,16 +442,19 @@
- 			if [ ! -z "$meshconfigs" ]; then
- 				for meshconfig in $meshconfigs; do
- 					ifname=$(uci get $meshconfig.ifname 2> /dev/null)
--
--					if [ -z "$ifname" ] || [ "$ifname" != "mesh$meshindex" ]; then
--						# No interface name in config, so add one
--						ucibatch="set $meshconfig.ifname='mesh$meshindex'"
--						echo "$ucibatch" | uci batch
--						changed=1
--						syslogmessage="Setting mesh interface name to [ mesh$meshindex ]"
--						write_to_syslog
-+					device=$(uci -q get $meshconfig.device)
-+					device_type=$(uci -q get wireless.$device.type)
-+					new_ifname="halow_mesh"
-+					if [ "$device_type" == "morse" ]; then
-+						if [ -z "$ifname" ] || [ "$ifname" != "$new_ifname" ]; then
-+							# No interface name in config, so add one
-+							ucibatch="set $meshconfig.ifname='$new_ifname'"
-+							echo "$ucibatch" | uci batch
-+							changed=1
-+							syslogmessage="Setting mesh interface name to [ $new_ifname ]"
-+							write_to_syslog
-+						fi
- 					fi
--					meshindex=$(($meshindex+1))
- 				done
- 
- 				if [ "$changed" -eq 1 ]; then

feeds/morse/utils/wpa_supplicant_s1g/Config.in

@@ -2,7 +2,7 @@ if PACKAGE_wpa_supplicant_s1g
 
 	config MORSE_WPA_SUPPLICANT_S1G_MESH_NETWORKING
 		bool
-		default y
+		default n
 		prompt "Enable mesh networking support"
 
 	config MORSE_WPA_SUPPLICANT_S1G_EAP

feeds/qca-wifi-7/ath12k-wifi/Makefile

@@ -43,11 +43,6 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for EAP105
 endef
 
-define Package/ath12k-wifi-emplus-wap7635
-$(call Package/ath12k-wifi-default)
-    TITLE:=board-2.bin for WAP7635
-endef
-
 define Package/ath12k-wifi-sonicfi-rap7110c-341x
 $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP7710c_341x
@@ -101,8 +96,8 @@ endef
 define Package/ath12k-wifi-cig-wf189/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf189-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.wf189-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.wf189.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf189.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
 define Package/ath12k-wifi-edgecore-eap105/install
@@ -112,13 +107,6 @@ define Package/ath12k-wifi-edgecore-eap105/install
 	$(INSTALL_DATA) ./board-2.bin.eap105.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
-define Package/ath12k-wifi-emplus-wap7635/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wap7635.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.wap7635.QCN6274 $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-endef
-
 define Package/ath12k-wifi-sonicfi-rap7110c-341x/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
@@ -156,8 +144,8 @@ endef
 define Package/ath12k-wifi-cig-wf189w/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189w-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.189w-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.189w.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189w.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -165,8 +153,8 @@ endef
 define Package/ath12k-wifi-cig-wf189h/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189h-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.189h-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.189h.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189h.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -194,13 +182,12 @@ endef
 define Package/ath12k-wifi-cig-wf672/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf672-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.wf672-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.wf672.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf672.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189))
 $(eval $(call BuildPackage,ath12k-wifi-edgecore-eap105))
-$(eval $(call BuildPackage,ath12k-wifi-emplus-wap7635))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap7110c-341x))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750e-h))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750e-s))

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds

@@ -7,11 +7,6 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
-emplus,wap7635)
-	ucidef_set_led_default "ledb" "LEDB" "sys:blue" "on"
-	ucidef_set_led_default "ledg" "LEDG" "sys:green" "off"
-	ucidef_set_led_default "ledr" "LEDR" "sys:red" "off"
-	;;
 sercomm,ap72tip-v4|\
 sercomm,ap72tip)
 	ucidef_set_led_default "power" "POWER" "blue:status" "on"

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network

@@ -13,6 +13,7 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4 eth5" "eth0"
 		;;
 	cig,wf189|\
+	cig,wf672|\
 	edgecore,eap105|\
 	sercomm,ap72tip|\
 	sonicfi,rap750w-311a)
@@ -31,10 +32,6 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		ucidef_add_switch "switch1" "0u@eth1" "3:lan" "2:lan"
 		;;
-	cig,wf672)
-		ucidef_set_interface_wan "eth0 eth1"
-		;;
-	emplus,wap7635|\
 	sercomm,ap72tip-v4)
 		ucidef_set_interface_wan "eth0"
 		;;	
@@ -107,7 +104,6 @@ qcom_setup_macs()
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 2)
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 3)
                 ;;
-        emplus,wap7635|\
         sercomm,ap72tip-v4)
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 1)

feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata

@@ -64,7 +64,6 @@ ath12k/IPQ5332/hw1.0/caldata.bin)
 	cig,wf189h|\
 	cig,wf189|\
 	edgecore,eap105|\
-	emplus,wap7635|\
 	sercomm,ap72tip-v4|\
 	sercomm,ap72tip|\
 	zyxel,nwa130be)
@@ -87,7 +86,6 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 	case "$board" in
 	cig,wf189|\
 	edgecore,eap105|\
-	emplus,wap7635|\
 	sercomm,ap72tip-v4|\
 	sercomm,ap72tip|\
 	zyxel,nwa130be)
@@ -126,47 +124,6 @@ ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi2@c0000000.bin)
 		;;
 	esac
 	;;
-ath12k/IPQ5332/hw1.0/board-2.bin)
-	case "$board" in
-	cig,wf189|\
-	cig,wf189h|\
-	cig,wf189w|\
-	cig,wf672)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.CA /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-                else
-                        ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-                fi
-                ;;
-	esac
-	;;
-ath12k/QCN6432/hw1.0/board-2.bin)
-	case "$board" in
-	cig,wf189h|\
-	cig,wf189w)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
-                else
-                        ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
-                fi
-                ;;
-	esac
-	;;
-ath12k/QCN92XX/hw1.0/board-2.bin)
-	case "$board" in
-	cig,wf189|\
-	cig,wf672)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-                else
-                        ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-                fi
-                ;;
-	esac
-	;;
 *)
 	exit 1
 	;;

feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh

@@ -136,8 +136,7 @@ platform_do_upgrade() {
 	sercomm,ap72tip|\
 	cig,wf189w|\
 	cig,wf189h|\
-	cig,wf189|\
-	emplus,wap7635)
+	cig,wf189)
 		if [ -f /proc/boot_info/bootconfig0/rootfs/upgradepartition ]; then
 			CI_UBIPART="$(cat /proc/boot_info/bootconfig0/rootfs/upgradepartition)"
 			CI_BOOTCFG=1

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-emplus-wap7635.dts

@@ -1,413 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/*
- * IPQ5332 RDP468 board device tree source
- *
- * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include "ipq5332.dtsi"
-#include "ipq5332-default-memory.dtsi"
-
-/ {
-	model = "Emplus WAP7635";
-	compatible = "emplus,wap7635", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332";
-
-	aliases {
-		serial0 = &blsp1_uart0; /*console*/
-		ethernet0 = "/soc/dp1";
-
-        led-boot = &led_power_green;
-        led-failsafe = &led_power_red;
-        led-running = &led_power_green;
-        led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-
-	soc@0 {
-		mdio:mdio@90000 {
-			pinctrl-0 = <&mdio1_pins>;
-			pinctrl-names = "default";
-			phy-reset-gpio = <&tlmm 51 GPIO_ACTIVE_LOW>;
-			phyaddr_fixup = <0xC90F018>;
-			uniphyaddr_fixup = <0xC90F014>;
-			mdio_clk_fixup; /* MDIO clock sequence fix up flag */
-			status = "okay";
-
-			phy0: ethernet-phy@0 {
-				reg = <24>;
-			};
-		};
-
-		ess-instance {
-			/*num_devices = <0x1>;*/
-			ess-switch@3a000000 {
-				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-				switch_lan_bmp = <0x2>; /* lan port bitmap */
-				switch_wan_bmp = <0>; /* wan port bitmap */
-				switch_mac_mode = <0xf>; /* mac mode for uniphy instance0*/
-				switch_mac_mode1 = <0xd>; /* mac mode for uniphy instance1*/
-				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
-
-				qcom,port_phyinfo {
-					port@0 {
-						port_id = <1>;
-						phy_address = <24>;
-						mdiobus = <&mdio>;
-						ethernet-phy-ieee802.3-c45;
-					};
-				};
-			};
-		};
-
-		dp1 {
-			device_type = "network";
-			compatible = "qcom,nss-dp";
-			qcom,id = <1>;
-			reg = <0x3a500000 0x4000>;
-			qcom,mactype = <1>;
-			local-mac-address = [000000000000];
-			mdio-bus = <&mdio>;
-			qcom,phy-mdio-addr = <24>;
-			qcom,link-poll = <1>;
-			phy-mode = "sgmii";
-			/* phy-mode = "usxgmii"; */
-		};
-
-		/* EDMA host driver configuration for the board */
-		edma@3ab00000 {
-			qcom,txdesc-ring-start = <4>;		/* Tx desc ring start ID */
-			qcom,txdesc-rings = <12>;			/* Total number of Tx desc rings to be provisioned */
-			qcom,mht-txdesc-rings = <8>;		/* Extra Tx desc rings to be provisioned for MHT SW ports */
-			qcom,txcmpl-ring-start = <4>;		/* Tx complete ring start ID */
-			qcom,txcmpl-rings = <12>;			/* Total number of Tx complete rings to be provisioned */
-			qcom,mht-txcmpl-rings = <8>;		/* Extra Tx complete rings to be provisioned for mht sw ports. */
-			qcom,rxfill-ring-start = <4>;		/* Rx fill ring start ID */
-			qcom,rxfill-rings = <4>;			/* Total number of Rx fill rings to be provisioned */
-			qcom,rxdesc-ring-start = <12>;		/* Rx desc ring start ID */
-			qcom,rxdesc-rings = <4>;			/* Total number of Rx desc rings to be provisioned */
-			qcom,rx-page-mode = <0>;			/* Rx fill ring page mode */
-			qcom,tx-map-priority-level = <1>;	/* Tx priority level per port */
-			qcom,rx-map-priority-level = <1>;	/* Rx priority level per core */
-			qcom,ppeds-num = <2>;				/* Number of PPEDS nodes */
-
-			/* PPE-DS node format: <Rx-fill Tx-cmpl Rx Tx Queue-base Queue-count> */
-			qcom,ppeds-map = <1 1 1 1 32 8>,		/* PPEDS Node#0 ring and queue map */
-							 <2 2 2 2 40 8>;		/* PPEDS Node#1 ring and queue map */
-			qcom,txdesc-map = <8 9 10 11>,			/* Port0 per-core Tx ring map */
-							  <12 13 14 15>,		/* MHT-Port1 per-core Tx ring map */
-							  <4 5 6 7>,			/* MHT-Port2 per-core Tx ring map/packets from  vp*/
-							  <16 17 18 19>,		/* MHT-Port3 per-core Tx ring map */
-							  <20 21 22 23>;		/* MHT-Port4 per-core Tx ring map */
-			qcom,txdesc-fc-grp-map = <1 2 3 4 5>;	/* Per GMAC flow control group map */
-			qcom,rxfill-map = <4 5 6 7>;			/* Per-core Rx fill ring map */
-			qcom,rxdesc-map = <12 13 14 15>;		/* Per-core Rx desc ring map */
-			qcom,rx-queue-start = <0>;				/* Rx queue start */
-			qcom,rx-ring-queue-map = <0 8 16 24>,	/* Priority 0 queues per-core Rx ring map */
-									 <1 9 17 25>,	/* Priority 1 queues per-core Rx ring map */
-									 <2 10 18 26>,	/* Priority 2 queues per-core Rx ring map */
-									 <3 11 19 27>,	/* Priority 3 queues per-core Rx ring map */
-									 <4 12 20 28>,	/* Priority 4 queues per-core Rx ring map */
-									 <5 13 21 29>,	/* Priority 5 queues per-core Rx ring map */
-									 <6 14 22 30>,	/* Priority 6 queues per-core Rx ring map */
-									 <7 15 23 31>;	/* Priority 7 queues per-core Rx ring map */
-			interrupts = <0 163 4>,					/* Tx complete ring id #4 IRQ info */
-						 <0 164 4>,					/* Tx complete ring id #5 IRQ info */
-						 <0 165 4>,					/* Tx complete ring id #6 IRQ info */
-						 <0 166 4>,					/* Tx complete ring id #7 IRQ info */
-						 <0 167 4>,					/* Tx complete ring id #8 IRQ info */
-						 <0 168 4>,					/* Tx complete ring id #9 IRQ info */
-						 <0 169 4>,					/* Tx complete ring id #10 IRQ info */
-						 <0 170 4>,					/* Tx complete ring id #11 IRQ info */
-						 <0 171 4>,					/* Tx complete ring id #12 IRQ info */
-						 <0 172 4>,					/* Tx complete ring id #13 IRQ info */
-						 <0 173 4>,					/* Tx complete ring id #14 IRQ info */
-						 <0 174 4>,					/* Tx complete ring id #15 IRQ info */
-						 <0 139 4>,					/* Rx desc ring id #12 IRQ info */
-						 <0 140 4>,					/* Rx desc ring id #13 IRQ info */
-						 <0 141 4>,					/* Rx desc ring id #14 IRQ info */
-						 <0 142 4>,					/* Rx desc ring id #15 IRQ info */
-						 <0 191 4>,					/* Misc error IRQ info */
-						 <0 155 4>,					/* RxFill ring id #4 IRQ info */
-						 <0 156 4>,					/* RxFill ring id #5 IRQ info */
-						 <0 157 4>,					/* RxFill ring id #6 IRQ info */
-						 <0 158 4>,					/* RxFill ring id #7 IRQ info */
-						 <0 160 4>,					/* PPEDS Node #1(TxComp ring id #1) TxComplete IRQ info */
-						 <0 128 4>,					/* PPEDS Node #1(Rx Desc ring id #1) Rx Desc IRQ info */
-						 <0 152 4>,					/* PPEDS Node #1(RxFill Desc ring id #1) Rx Fill IRQ info */
-						 <0 161 4>,					/* PPEDS Node #2(TxComp ring id #2) TxComplete IRQ info */
-						 <0 129 4>,					/* PPEDS Node #2(Rx Desc ring id #2) Rx Desc IRQ info */
-						 <0 153 4>,					/* PPEDS Node #2(RxFill Desc ring id #2) Rx Fill IRQ info */
-						 <0 175 4>,					/* MHT port Tx complete ring id #16 IRQ info */
-						 <0 176 4>,					/* MHT port Tx complete ring id #17 IRQ info */
-						 <0 177 4>,					/* MHT port Tx complete ring id #18 IRQ info */
-						 <0 178 4>,					/* MHT port Tx complete ring id #19 IRQ info */
-						 <0 179 4>,					/* MHT port Tx complete ring id #20 IRQ info */
-						 <0 180 4>,					/* MHT port Tx complete ring id #21 IRQ info */
-						 <0 181 4>,					/* MHT port Tx complete ring id #22 IRQ info */
-						 <0 182 4>;					/* MHT port Tx complete ring id #23 IRQ info */
-		};
-
-		leds {
-			compatible = "gpio-leds";
-
-			led_power_blue: led@34 {
-				label = "sys:blue";
-				gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
-				default-state = "off";
-			};
-			led_power_green: led@35 {
-				label = "sys:green";
-				gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
-				default-state = "off";
-			};
-			led_power_red: led@37 {
-				label = "sys:red";
-				gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
-				default-state = "off";
-			};
-		};
-
-		gpio_keys {
-			compatible = "gpio-keys";
-			pinctrl-0 = <&button_pins>;
-			pinctrl-names = "default";
-			button@1 {
-				label = "reset";
-				linux,code = <KEY_RESTART>;
-				gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
-				linux,input-type = <1>;
-				debounce-interval = <60>;
-			};
-		};
-
-		wsi: wsi {
-			id = <0>;
-			num_chip = <2>;
-			status = "okay";
-			chip_info = <0 1 1>,
-						<1 1 0>;
-		};
-	};
-};
-
-&wifi0 {
-	led-gpio = <&tlmm 36 GPIO_ACTIVE_HIGH>;
-	qcom,rproc = <&q6_wcss_pd1>;
-	qcom,rproc_rpd = <&q6v5_wcss>;
-	qcom,multipd_arch;
-	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
-	memory-region = <&q6_region>;
-	qcom,wsi = <&wsi>;
-	qcom,wsi_index = <0>;
-	qcom,board_id = <0x16>;
-	status = "okay";
-};
-
-&mhi_region1 {
-	status = "okay";
-};
-
-&qcn9224_pcie1 {
-	status = "okay";
-};
-
-/* QCN9224 5G+6G */
-&wifi4 {
-	hremote_node = <&qcn9224_pcie1>;
-	board_id = <0x1019>;
-	node_id = <0x1>;
-	status = "okay";
-};
-
-&blsp1_uart0 {
-	pinctrl-0 = <&serial_0_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&blsp1_uart1 {
-	pinctrl-0 = <&serial_1_pins>;
-	pinctrl-names = "default";
-	status = "disabled";
-};
-
-&sdhc {
-	bus-width = <4>;
-	max-frequency = <192000000>;
-	mmc-ddr-1_8v;
-	mmc-hs200-1_8v;
-	non-removable;
-	pinctrl-0 = <&sdc_default_state>;
-	pinctrl-names = "default";
-	status = "disabled";
-};
-
-&sleep_clk {
-	clock-frequency = <32000>;
-};
-
-&xo {
-	clock-frequency = <24000000>;
-};
-
-&qpic_bam {
-	status = "okay";
-};
-
-&qpic_nand {
-	pinctrl-0 = <&qspi_default_state>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	nandcs@0 {
-		reg = <0>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		nand-ecc-strength = <8>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-	};
-};
-
-&pcie1_phy_x2 {
-	status = "okay";
-};
-
-&pcie1 {
-	pinctrl-0 = <&pcie1_default_state>;
-	pinctrl-names = "default";
-	perst-gpios = <&tlmm 45 GPIO_ACTIVE_LOW>;
-	status = "okay";
-
-	pcie1_rp {
-		reg = <0 0 0 0 0>;
-
-		qcom,mhi@1 {
-			reg = <0 0 0 0 0>;
-			boot-args = <0x2 0x4 0x34 0x3 0x0 0x0     /* MX Rail, GPIO52, Drive strength 0x3 */
-						 0x4 0x4 0x18 0x3 0x0 0x0     /* RFA1p2 Rail, GPIO24, Drive strength 0x3 */
-						 0x0 0x4 0x0 0x0 0x0 0x0>;    /* End of arguments */
-			memory-region = <&qcn9224_pcie1>;
-			qcom,wsi = <&wsi>;
-			qcom,wsi_index = <1>;
-			qcom,board_id = <0x1019>;
-		};
-	};
-};
-
-/* PINCTRL */
-
-&tlmm {
-	sdc_default_state: sdc-default-state {
-		clk-pins {
-			pins = "gpio13";
-			function = "sdc_clk";
-			drive-strength = <8>;
-			bias-disable;
-		};
-
-		cmd-pins {
-			pins = "gpio12";
-			function = "sdc_cmd";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		data-pins {
-			pins = "gpio8", "gpio9", "gpio10", "gpio11";
-			function = "sdc_data";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	spi_0_data_clk_pins: spi-0-data-clk-state {
-		pins = "gpio14", "gpio15", "gpio16";
-		function = "blsp0_spi";
-		drive-strength = <2>;
-		bias-pull-down;
-	};
-
-	spi_0_cs_pins: spi-0-cs-state {
-		pins = "gpio17";
-		function = "blsp0_spi";
-		drive-strength = <2>;
-		bias-pull-up;
-	};
-
-	qspi_default_state: qspi-default-state {
-		qspi_clock {
-			pins = "gpio13";
-			function = "qspi_clk";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-
-		qspi_cs {
-			pins = "gpio12";
-			function = "qspi_cs";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		qspi_data {
-			pins = "gpio8", "gpio9", "gpio10", "gpio11";
-			function = "qspi_data";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-
-	serial_1_pins: serial1-pinmux { /*ble*/
-		pins = "gpio33", "gpio35";
-		function = "blsp1_uart2";
-		drive-strength = <8>;
-		bias-pull-up;
-	};
-
-	button_pins: button-state {
-		pins = "gpio24";
-		function = "gpio";
-		drive-strength = <8>;
-		bias-pull-up;
-	};
-
-	pcie1_default_state: pcie1-default-state {
-		pins = "gpio45";
-		function = "gpio";
-		drive-strength = <8>;
-		bias-pull-up;
-		output-low;
-	};
-};
-
-&license_manager {
-	status = "okay";
-};
-
-&usb3 {
-	qcom,multiplexed-phy;
-	status = "disabled";
-};
-
-&hs_m31phy_0 {
-	status = "okay";
-};
-
-&hs_m31phy_0 {
-	status = "okay";
-};
-
-&ssuniphy_0 {
-	status = "okay";
-};

feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk

@@ -52,19 +52,6 @@ define Device/edgecore_eap105
 endef
 TARGET_DEVICES += edgecore_eap105
 
-define Device/emplus_wap7635
-  DEVICE_TITLE := EMPLUS WAP7635
-  DEVICE_DTS := ipq5332-emplus-wap7635
-  DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
-  IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
-  IMAGE/nand-factory.ubi := append-ubi
-  DEVICE_PACKAGES := ath12k-wifi-emplus-wap7635 ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
-endef
-TARGET_DEVICES += emplus_wap7635
-
 define Device/sonicfi_rap7110c_341x
   DEVICE_TITLE := SONICFI RAP7110C-341X
   DEVICE_DTS := ipq5332-sonicfi-rap7110c-341x

feeds/tip/certificates/files/etc/init.d/early_boot

@@ -20,7 +20,6 @@ copy_certificates() {
 	[ -z "$country" ] && country=US
 	echo "options cfg80211 ieee80211_regdom="$country > /etc/modules.conf 
 	echo -n $country > /etc/ucentral/country
-	sync
 	exit 0
 }
 

feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery

@@ -91,7 +91,6 @@ function gateway_write(data) {
 	}
 	if (changed)
 		fs.writefile('/etc/ucentral/gateway.json', new);
-		system('sync');
 	return changed;
 }
 

feeds/ucentral/ucentral-schema/Makefile

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=9b12cf94b94688aaf2245742ac1cd3d7a2bccade7e248c47c5f13a3dd7c07401
+PKG_MIRROR_HASH:=1ad9f7b5d5d1145e3aed14937eef60d6794d821e0244cc8fa824400d3da47f5a
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2025-07-11
-PKG_SOURCE_VERSION:=b971b73d4cedae6175926373adcdc37a04ced11c
+PKG_SOURCE_VERSION:=5276d0b8b6e83ab57354b0bcbb820de83a91ab88
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

patches/0090-netifd-add-gcmp-256-on-6GHz.patch

@@ -1,68 +0,0 @@
-From a2a7cdf9e292bac5b146738276a593d8e119fe8f Mon Sep 17 00:00:00 2001
-From: Marek Kwaczynski <marek@shasta.cloud>
-Date: Thu, 3 Jul 2025 15:55:43 +0000
-Subject: [PATCH] netifd: add gcmp-256 as a cipher suite when SAE is enabled on
- HE/EHT
-
-Enabling gcmp-256 only on 6GHz radio.
-
-Fixes: WIFI-14594
-
-Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>
----
- .../config/netifd/patches/200-gcmp-256.patch  | 43 +++++++++++++++++++
- 1 file changed, 43 insertions(+)
- create mode 100644 package/network/config/netifd/patches/200-gcmp-256.patch
-
-diff --git a/package/network/config/netifd/patches/200-gcmp-256.patch b/package/network/config/netifd/patches/200-gcmp-256.patch
-new file mode 100644
-index 0000000000..7ac6262e7f
---- /dev/null
-+++ b/package/network/config/netifd/patches/200-gcmp-256.patch
-@@ -0,0 +1,43 @@
-+Index: netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
-+===================================================================
-+--- netifd-2023-09-19-8587c074.orig/scripts/netifd-wireless.sh
-++++ netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
-+@@ -39,11 +39,10 @@ prepare_key_wep() {
-+ }
-+ 
-+ _wdev_prepare_channel() {
-+-	json_get_vars channel band hwmode
-++	json_get_vars channel band hwmode htmode
-+ 
-+ 	auto_channel=0
-+ 	enable_ht=0
-+-	htmode=
-+ 	hwmode="${hwmode##11}"
-+ 
-+ 	case "$channel" in
-+@@ -70,7 +69,14 @@ _wdev_prepare_channel() {
-+ 
-+ 	case "$band" in
-+ 		2g) hwmode=g;;
-+-		5g|6g) hwmode=a;;
-++		5g) hwmode=a;;
-++		6g)
-++			hwmode=a;
-++			case "$htmode" in
-++				HE*|EHT*) wpa3_cipher="GCMP-256 ";;
-++				*) wpa3_cipher="";;
-++			esac
-++		;;
-+ 		60g) hwmode=ad;;
-+ 		*)
-+ 			case "$hwmode" in
-+@@ -216,6 +222,9 @@ wireless_vif_parse_encryption() {
-+ 		wpa_cipher="GCMP"
-+ 	else
-+ 		wpa_cipher="CCMP"
-++		case "$encryption" in
-++			sae*|wpa3*|psk3*|owe) wpa_cipher="${wpa3_cipher}$wpa_cipher";;
-++		esac
-+ 	fi
-+ 
-+ 	case "$encryption" in
--- 
-2.43.0
-

profiles/emplus_wap7635.yml

@@ -1,22 +0,0 @@
----
-profile: emplus_wap7635
-target: ipq53xx
-subtarget: generic
-description: Build image for the EMPLUS WAP7635
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-emplus_wap7635-squashfs-sysupgrade.tar
-feeds:
-  - name: qca
-    path: ../../feeds/qca-wifi-7
-include:
-  - ucentral-ap
-packages:
-  - ipq53xx
-  - qca-ssdk-shell
-  - iperf3
-  - jq
-  - sysstat
-  - tree
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
-  CONFIG_BUSYBOX_CUSTOM=y
-  CONFIG_BUSYBOX_CONFIG_PSTREE=y