diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index 53f557c495..a2bd6b11bc 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -12,336 +12,14 @@ ar71xx_setup_interfaces()
 	local board="$1"
 
 	case "$board" in
-	all0315n|\
-	all0258n|\
-	dlan-hotspot|\
-	dlan-pro-500-wp|\
-	dr344|\
-	ja76pf2|\
-	rocket-m-ti|\
-	ubnt-unifi-outdoor)
-		ucidef_set_interface_lan "eth0 eth1"
-		;;
-	ap132|\
-	ap136|\
-	ap152|\
-	rb-750gl|\
-	rb-751g|\
-	rb-951g-2hnd|\
-	wlr8100|\
-	wzr-hp-g450h)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
-		;;
-	esr1750|\
-	epg5000)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
-		;;
-	cr5000|\
-	dgl-5500-a1|\
-	dhp-1565-a1|\
-	dir-835-a1|\
-	dir-825-c1|\
-	esr900|\
-	mynet-n750|\
-	wndr3700v4|\
-	wndr4300)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
-		;;
-	ap136-010|\
-	ap147-010|\
-	nbg6616|\
-	nbg6716)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
-		;;
-	ap136-020|\
-	ap135-020|\
-	tew-823dru|\
-	tl-wr1043nd-v2|\
-	wzr-450hp2)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "6@eth0"
-		;;
-	archer-c5|\
-	archer-c7|\
-	tl-wdr4900-v2)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
-		;;
-	bsb)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth1" "1:lan" "3:lan"
-		;;
-	cpe210|\
-	cpe510)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "5:lan" "4:wan"
-		;;
 	airgatewaypro)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "4:lan" "5:wan"
 		;;
-	db120|\
-	rb-2011l|\
-	rb-2011uas|\
-	rb-2011uias|\
-	rb-2011uas-2hnd|\
-	rb-2011uias-2hnd)
-		case "$board" in
-		rb-2011uas*|\
-		rb-2011uias|\
-		rb-2011uias-2hnd)
-			ucidef_add_switch "switch0" \
-				"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan" "6:sfp"
-		;;
-		*)
-			ucidef_add_switch "switch0" \
-				"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
-		;;
-		esac
-
-		ucidef_add_switch "switch1" \
-			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:lan"
-		;;
-	dir-825-b1|\
-	nbg460n_550n_550nh|\
-	tew-673gru|\
-	wzr-hp-g300nh)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
-		;;
-	f9k1115v2)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "0@eth0" "1:wan"
-		;;
-	ap143|\
-	rb-433|\
-	rb-433u)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"1:lan" "2:lan" "5@eth1"
-		;;
-	rb-435g)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth1" "1:lan" "2:lan"
-		;;
-	rb-450)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "2:lan" "3:lan" "5@eth1"
-		;;
-	rb-450g|\
-	routerstation-pro)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth1" "2:lan:3" "3:lan:2" "4:lan:1"
-		;;
-	rb-493g)
-		ucidef_set_interfaces_lan_wan "eth0 eth1.1" "eth1.2"
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
-		ucidef_add_switch "switch1" \
-			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
-		;;
-	wzr-hp-g300nh2|\
-	pb92|\
-	ap113)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "2:wan"
-		;;
-	el-m150)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "3@eth1"
-		;;
-	tellstick-znet-lite)
-		ucidef_set_interface_wan "eth0"
-		ucidef_set_interface_raw "wlan" "wlan0" "dhcp"
-		;;
-	tl-wdr4300|\
-	tl-wr1041n-v2)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
-		;;
-	tl-wr1043nd)
-		ucidef_add_switch "switch0" \
-			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
-		;;
-	tl-wr2543n)
-		ucidef_add_switch "switch0" \
-			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
-		;;
-	tl-wr841n-v1|\
-	tl-wr941nd)
-		ucidef_set_interface_raw "eth" "eth0"
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
-		;;
-	dir-615-i1|\
-	omy-g1|\
-	r6100|\
-	smart-300|\
-	tl-mr3420-v2|\
-	tl-wr841n-v8|\
-	tl-wr842n-v2|\
-	tl-wr941nd-v5|\
-	tl-wr941nd-v6|\
-	tl-wdr6500-v2|\
-	wnr2000-v3|\
-	wnr2000-v4|\
-	wnr2200|\
-	wnr612-v2|\
-	wnr1000-v2|\
-	wpn824n)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth1"
-		;;
-	uap-pro|\
-	wpj342)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan" "2:wan"
-		;;
-	nanostation-m-xw)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "5:lan" "1:wan"
-		;;
-	wrt160nl)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth0"
-		;;
-	cr3000)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
-		;;
-	onion-omega)
-		ucidef_set_interface_lan "wlan0"
-		;;
-	dlan-pro-1200-ac)
-		ucidef_set_interface_lan "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth0" "2:lan" "3:lan" "4:lan"
-		ucidef_add_switch_attr "switch0" "enable" "false"
-		;;
-	alfa-ap120c|\
-	all0305|\
-	antminer-s1|\
-	antminer-s3|\
-	antrouter-r1|\
-	aw-nr580|\
-	bullet-m|\
-	c-55|\
-	cap4200ag|\
-	eap300v2|\
-	eap7660d|\
-	el-mini|\
-	loco-m-xw|\
-	mr1750|\
-	mr1750v2|\
-	mr18|\
-	mr600|\
-	mr600v2|\
-	mr900|\
-	mr900v2|\
-	rb-411|\
-	rb-911g-2hpnd|\
-	rb-911g-5hpacd|\
-	rb-911g-5hpnd|\
-	rb-912uag-2hpnd|\
-	rb-912uag-5hpnd|\
-	rb-sxt2n|\
-	rb-sxt5n|\
-	rocket-m-xw|\
-	tl-mr10u|\
-	tl-mr11u|\
-	tl-mr12u|\
-	tl-mr13u|\
-	tl-mr3020|\
-	tl-mr3040|\
-	tl-mr3040-v2|\
-	tl-wa701nd-v2|\
-	tl-wa7210n-v2|\
-	tl-wa750re|\
-	tl-wa850re|\
-	tl-wa830re-v2|\
-	tl-wa801nd-v2|\
-	tl-wa901nd|\
-	tl-wa901nd-v2|\
-	tl-wa901nd-v3|\
-	tl-wa901nd-v4|\
-	tl-wr703n|\
-	tube2h|\
-	unifiac-lite|\
-	wndap360|\
-	mynet-rext|\
-	wp543)
-		ucidef_set_interface_lan "eth0"
-		;;
-	cap324)
-		ucidef_set_interface_lan "eth0" "dhcp"
-		;;
-	arduino-yun|\
-	tl-wa801nd-v3|\
-	dir-505-a1)
-		ucidef_set_interface_lan "eth1"
-		;;
-	alfa-ap96|\
-	alfa-nx|\
-	ap83|\
-	gl-ar150|\
-	gl-ar300m|\
-	gl-domino|\
-	gl-inet|\
-	gl-mifi|\
-	jwap003|\
-	pb42|\
-	pb44|\
-	rb-951ui-2hnd|\
-	routerstation|\
-	tl-wr710n|\
-	tl-wr720n-v3|\
-	tl-wr810n|\
-	wpe72|\
-	wrtnode2q)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		;;
-	gl-ar300)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
-		;;
-	jwap230)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0@eth0" "1:lan" "5:wan" "6@eth1"
-		;;
-	wpj344)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "3:lan" "2:wan"
-		;;
-	unifiac-pro)
-		ucidef_add_switch "switch0" \
-			"0@eth0" "2:lan" "3:wan"
-		;;
-	wpj558)
-		ucidef_add_switch "switch0" \
-			"5:lan" "1:wan" "6@eth0"
-		;;
+	airrouter|\
 	ap121|\
 	ap121-mini|\
 	ap96|\
-	airrouter|\
 	dir-600-a1|\
 	dir-615-c1|\
 	dir-615-e1|\
@@ -366,9 +44,9 @@ ar71xx_setup_interfaces()
 	tl-wdr3500|\
 	tl-wr741nd|\
 	tl-wr741nd-v4|\
+	tl-wr841n-v11|\
 	tl-wr841n-v7|\
 	tl-wr841n-v9|\
-	tl-wr841n-v11|\
 	tl-wr842n-v3|\
 	whr-g301n|\
 	whr-hp-g300n|\
@@ -379,9 +57,238 @@ ar71xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
 		;;
+	alfa-ap120c|\
+	all0305|\
+	antminer-s1|\
+	antminer-s3|\
+	antrouter-r1|\
+	aw-nr580|\
+	bullet-m|\
+	c-55|\
+	cap4200ag|\
+	eap300v2|\
+	eap7660d|\
+	el-mini|\
+	loco-m-xw|\
+	mr1750|\
+	mr1750v2|\
+	mr18|\
+	mr600|\
+	mr600v2|\
+	mr900|\
+	mr900v2|\
+	mynet-rext|\
+	rb-411|\
+	rb-911g-2hpnd|\
+	rb-911g-5hpacd|\
+	rb-911g-5hpnd|\
+	rb-912uag-2hpnd|\
+	rb-912uag-5hpnd|\
+	rb-sxt2n|\
+	rb-sxt5n|\
+	rocket-m-xw|\
+	tl-mr10u|\
+	tl-mr11u|\
+	tl-mr12u|\
+	tl-mr13u|\
+	tl-mr3020|\
+	tl-mr3040|\
+	tl-mr3040-v2|\
+	tl-wa701nd-v2|\
+	tl-wa7210n-v2|\
+	tl-wa750re|\
+	tl-wa801nd-v2|\
+	tl-wa830re-v2|\
+	tl-wa850re|\
+	tl-wa901nd|\
+	tl-wa901nd-v2|\
+	tl-wa901nd-v3|\
+	tl-wa901nd-v4|\
+	tl-wr703n|\
+	tube2h|\
+	unifiac-lite|\
+	wndap360|\
+	wp543)
+		ucidef_set_interface_lan "eth0"
+		;;
+	alfa-ap96|\
+	alfa-nx|\
+	ap83|\
+	gl-ar150|\
+	gl-ar300m|\
+	gl-domino|\
+	gl-inet|\
+	gl-mifi|\
+	jwap003|\
+	pb42|\
+	pb44|\
+	rb-951ui-2hnd|\
+	routerstation|\
+	tl-wr710n|\
+	tl-wr720n-v3|\
+	tl-wr810n|\
+	wpe72|\
+	wrtnode2q)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		;;
+	all0258n|\
+	all0315n|\
+	dlan-hotspot|\
+	dlan-pro-500-wp|\
+	dr344|\
+	ja76pf2|\
+	rocket-m-ti|\
+	ubnt-unifi-outdoor)
+		ucidef_set_interface_lan "eth0 eth1"
+		;;
+	ap113|\
+	pb92|\
+	wzr-hp-g300nh2)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "2:wan"
+		;;
+	ap132|\
+	ap136|\
+	ap152|\
+	rb-750gl|\
+	rb-751g|\
+	rb-951g-2hnd|\
+	wlr8100|\
 	wzr-hp-g450h)
 		ucidef_add_switch "switch0" \
-			"0@eth0" "2:lan:1 3:lan:2 4:lan:3 5:lan:4" "1:wan"
+			"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
+		;;
+	ap135-020|\
+	ap136-020|\
+	tew-823dru|\
+	tl-wr1043nd-v2|\
+	wzr-450hp2)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "6@eth0"
+		;;
+	ap136-010|\
+	ap147-010|\
+	nbg6616|\
+	nbg6716)
+		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
+		;;
+	ap143|\
+	rb-433|\
+	rb-433u)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"1:lan" "2:lan" "5@eth1"
+		;;
+	archer-c5|\
+	archer-c7|\
+	tl-wdr4900-v2)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
+		;;
+	arduino-yun|\
+	dir-505-a1|\
+	tl-wa801nd-v3)
+		ucidef_set_interface_lan "eth1"
+		;;
+	bsb)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0@eth1" "1:lan" "3:lan"
+		;;
+	cap324)
+		ucidef_set_interface_lan "eth0" "dhcp"
+		;;
+	cpe210|\
+	cpe510)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "5:lan" "4:wan"
+		;;
+	cr3000)
+		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
+		;;
+	cr5000|\
+	dgl-5500-a1|\
+	dhp-1565-a1|\
+	dir-825-c1|\
+	dir-835-a1|\
+	esr900|\
+	mynet-n750|\
+	wndr3700v4|\
+	wndr4300)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
+		;;
+	db120|\
+	rb-2011l|\
+	rb-2011uas|\
+	rb-2011uas-2hnd|\
+	rb-2011uias|\
+	rb-2011uias-2hnd)
+		case "$board" in
+		rb-2011uas*|\
+		rb-2011uias|\
+		rb-2011uias-2hnd)
+			ucidef_add_switch "switch0" \
+				"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan" "6:sfp"
+		;;
+		*)
+			ucidef_add_switch "switch0" \
+				"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
+		;;
+		esac
+
+		ucidef_add_switch "switch1" \
+			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:lan"
+		;;
+	dir-615-i1|\
+	omy-g1|\
+	r6100|\
+	smart-300|\
+	tl-mr3420-v2|\
+	tl-wdr6500-v2|\
+	tl-wr841n-v8|\
+	tl-wr842n-v2|\
+	tl-wr941nd-v5|\
+	tl-wr941nd-v6|\
+	wnr1000-v2|\
+	wnr2000-v3|\
+	wnr2000-v4|\
+	wnr2200|\
+	wnr612-v2|\
+	wpn824n)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth1"
+		;;
+	dir-825-b1|\
+	nbg460n_550n_550nh|\
+	tew-673gru|\
+	wzr-hp-g300nh)
+		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		ucidef_add_switch "switch0" \
+			"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
+		;;
+	dlan-pro-1200-ac)
+		ucidef_set_interface_lan "eth0"
+		ucidef_add_switch "switch0" \
+			"0@eth0" "2:lan" "3:lan" "4:lan"
+		ucidef_add_switch_attr "switch0" "enable" "false"
+		;;
+	el-m150)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0:lan" "1:lan" "3@eth1"
+		;;
+	epg5000|\
+	esr1750)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
 		;;
 	ew-dorin)
 		ucidef_add_switch "switch0" \
@@ -392,6 +299,82 @@ ar71xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0@eth0" "2:lan" "3:lan"
 		;;
+	f9k1115v2)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "0@eth0" "1:wan"
+		;;
+	gl-ar300)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
+		;;
+	jwap230)
+		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan" "5:wan" "6@eth1"
+		;;
+	nanostation-m-xw)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "5:lan" "1:wan"
+		;;
+	onion-omega)
+		ucidef_set_interface_lan "wlan0"
+		;;
+	rb-435g)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0@eth1" "1:lan" "2:lan"
+		;;
+	rb-450)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0:lan" "1:lan" "2:lan" "3:lan" "5@eth1"
+		;;
+	rb-450g|\
+	routerstation-pro)
+		ucidef_set_interfaces_lan_wan "eth1" "eth0"
+		ucidef_add_switch "switch0" \
+			"0@eth1" "2:lan:3" "3:lan:2" "4:lan:1"
+		;;
+	rb-493g)
+		ucidef_set_interfaces_lan_wan "eth0 eth1.1" "eth1.2"
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
+		ucidef_add_switch "switch1" \
+			"0@eth1" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
+		;;
+	tellstick-znet-lite)
+		ucidef_set_interface_wan "eth0"
+		ucidef_set_interface_raw "wlan" "wlan0" "dhcp"
+		;;
+	tl-wdr4300|\
+	tl-wr1041n-v2)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
+		;;
+	tl-wr1043nd)
+		ucidef_add_switch "switch0" \
+			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
+		;;
+	tl-wr2543n)
+		ucidef_add_switch "switch0" \
+			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
+		;;
+	tl-wr841n-v1|\
+	tl-wr941nd)
+		ucidef_set_interface_raw "eth" "eth0"
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
+		;;
+	uap-pro|\
+	wpj342)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan" "2:wan"
+		;;
+	unifiac-pro)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "2:lan" "3:wan"
+		;;
 	wndr3700)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		ucidef_add_switch "switch0" \
@@ -402,6 +385,23 @@ ar71xx_setup_interfaces()
 		ucidef_add_switch_port_attr "switch0" 2 led 9
 		ucidef_add_switch_port_attr "switch0" 5 led 2
 		;;
+	wpj344)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "3:lan" "2:wan"
+		;;
+	wpj558)
+		ucidef_add_switch "switch0" \
+			"5:lan" "1:wan" "6@eth0"
+		;;
+	wrt160nl)
+		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		ucidef_add_switch "switch0" \
+			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4@eth0"
+		;;
+	wzr-hp-g450h)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "2:lan:1 3:lan:2 4:lan:3 5:lan:4" "1:wan"
+		;;
 	z1)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		ucidef_add_switch "switch0" \