1 files changed, 18 insertions, 42 deletions
diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
index 476cc7eb8f..3122d40c92 100644
--- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
@@ -11,65 +11,41 @@ lantiq_setup_interfaces()
 	local board="$1"
 
 	case "$board" in
-	alphanetworks,asl56026)
-		ucidef_add_switch "switch0" \
-			"2:lan" "3:lan" "6t@eth0"
+	alphanetworks,asl56026|\
+	arcadyan,vg3503j)
+		ucidef_set_interface_lan "lan1 lan2"
 		;;
 	arcadyan,arv7519rw22)
-		ucidef_add_switch "switch0" \
-			"0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
-		;;
-	arcadyan,vg3503j)
-		ucidef_add_switch "switch0" \
-			"2:lan:2" "4:lan:1" "6t@eth0"
+		ucidef_set_interface_lan "lan1 lan2 lan3 lan4 lan5"
 		;;
 	arcadyan,vgv7510kw22-brn|\
-	arcadyan,vgv7510kw22-nor)
-		ucidef_add_switch "switch0" \
-			"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0"
-		;;
+	arcadyan,vgv7510kw22-nor|\
 	arcadyan,vgv7519-brn|\
 	arcadyan,vgv7519-nor|\
+	bt,homehub-v5a|\
 	lantiq,easy80920-nand|\
-	lantiq,easy80920-nor)
-		ucidef_add_switch "switch0" \
-			"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
+	lantiq,easy80920-nor|\
+	zyxel,p-2812hnu-f1|\
+	zyxel,p-2812hnu-f3)
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		;;
 	avm,fritz3370-rev2-hynix|\
 	avm,fritz3370-rev2-micron|\
 	avm,fritz3390|\
 	avm,fritz7360sl|\
 	avm,fritz7360-v2|\
-	avm,fritz7362sl)
-		ucidef_add_switch "switch0" \
-			"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
-		;;
-	avm,fritz7430)
-		ucidef_add_switch "switch0" \
-			"2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
-		;;
-	bt,homehub-v5a)
-		ucidef_add_switch "switch0" \
-			"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
-		;;
-	buffalo,wbmr-300hpd)
-		ucidef_add_switch "switch0" \
-			"5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0"
-		;;
+	avm,fritz7362sl|\
+	avm,fritz7430|\
+	buffalo,wbmr-300hpd|\
 	tplink,tdw8970|\
-	tplink,tdw8980)
-		ucidef_add_switch "switch0" \
-			"0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0"
-		;;
+	tplink,tdw8980|\
 	tplink,vr200|\
 	tplink,vr200v)
-		ucidef_add_switch "switch0" \
-			"0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
+		ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
 		;;
-	zyxel,p-2812hnu-f1|\
-	zyxel,p-2812hnu-f3)
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0"
+	avm,fritz7412|\
+	netgear,dm200)
+		ucidef_set_interface_lan "lan"
 		;;
 	*)
 		ucidef_set_interface_lan 'eth0'