diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq60xx b/package/boot/uboot-envtools/files/qualcommax_ipq60xx
index a424c70d06..01af4bcd52 100644
--- a/package/boot/uboot-envtools/files/qualcommax_ipq60xx
+++ b/package/boot/uboot-envtools/files/qualcommax_ipq60xx
@@ -30,9 +30,9 @@ netgear,wax214)
 redmi,ax5-jdcloud|\
 jdcloud,ax1800-pro|\
 jdcloud,ax6600)
-     mmcpart="$(find_mmc_part 0:APPSBLENV)"
-    [ -n "$mmcpart" ] && \
-        ubootenv_add_uci_config "$mmcpart" "0x0" "0x40000" "0x20000" "2"
+	mmcpart="$(find_mmc_part 0:APPSBLENV)"
+	[ -n "$mmcpart" ] && \
+		ubootenv_add_uci_config "$mmcpart" "0x0" "0x40000" "0x20000" "2"
 	;;
 yuncore,fap650)
 	idx="$(find_mtd_index 0:appsblenv)"
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index 090342fbf2..dbc4eec626 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -58,7 +58,7 @@ ALLWIFIBOARDS:= \
 	qnap_301w \
   redmi_ax5 \
   redmi_ax5-jdcloud \
-	redmi_ax6 \
+  redmi_ax6 \
 	skspruce_wia3300-20 \
 	spectrum_sax1v1k \
 	tplink_eap660hd-v1 \
diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
index d0cb8fe2ea..a55a64de43 100644
--- a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
@@ -11,22 +11,15 @@ ipq60xx_setup_interfaces()
 	local board="$1"
 
 	case "$board" in
-	8devices,mango-dvk)
+	8devices,mango-dvk|\
+	glinet,gl-axt1800)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
 	cambiumnetworks,xe3-4)
 		ucidef_set_interface_lan "lan1 lan2" "dhcp"
 		;;
-	glinet,gl-ax1800)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
-		;;
-	glinet,gl-axt1800)
-		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
-		;;
-	jdcloud,ax1800-pro)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
-		;;
 	cmiot,ax18|\
+	jdcloud,ax1800-pro|\
 	zn,m2|\
 	qihoo,v6|\
 	redmi,ax5|\
@@ -37,6 +30,7 @@ ipq60xx_setup_interfaces()
 	netgear,wax214)
 		ucidef_set_interfaces_lan_wan "lan"
 		;;
+	glinet,gl-ax1800|\
 	jdcloud,ax6600|\
 	yuncore,fap650)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
diff --git a/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
index 88f96f2bb7..3b58d1b1f5 100644
--- a/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
@@ -39,7 +39,7 @@ platform_do_upgrade() {
 		;;
 	redmi,ax5-jdcloud|\
 	jdcloud,ax1800-pro|\
-    jdcloud,ax6600)
+	jdcloud,ax6600)
 		kernelname="0:HLOS"
 		rootfsname="rootfs"
 		mmc_do_upgrade "$1"