X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Fetc%2Fboard.d%2F02_network;h=bbc93fff5bdcaab4d12f15abe6565c6d4d7c2596;hp=b88b6bb046bb58404b8b7fdb219cc41c3294bbce;hb=fb1273dfddd89ff487dae16265a2870e9d175dfb;hpb=9b02e73188158829d48835906edbb8702fd95e28

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 b88b6bb046..bbc93fff5b 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -3,19 +3,19 @@
 # Copyright (C) 2011-2015 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/system.sh
+. /lib/functions/uci-defaults.sh
 . /lib/ar71xx.sh
 
 board_config_update
 
-ucidef_set_interface_loopback
-
 board=$(ar71xx_board_name)
 
 
 case "$board" in
 all0315n |\
 all0258n |\
+dr344 |\
 ja76pf2|\
 rocket-m-ti |\
 ubnt-unifi-outdoor)
@@ -24,18 +24,21 @@ ubnt-unifi-outdoor)
 
 ap132 |\
 wlr8100)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
 	;;
 
 esr1750 |\
 epg5000)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
 	;;
 
+cr5000)
+	ucidef_add_switch "switch0" \
+		"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
+	;;
+
 ap136-010 |\
 ap147-010)
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
@@ -45,6 +48,7 @@ ap147-010)
 
 ap136-020 |\
 ap135-020 |\
+tew-823dru |\
 tl-wr1043nd-v2 |\
 wzr-450hp2)
 	ucidef_set_interfaces_lan_wan "eth1" "eth0"
@@ -68,13 +72,11 @@ bsb)
 	;;
 
 cpe510)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "5:lan" "4:wan"
 	;;
 
 airgatewaypro)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "4:lan" "5:wan"
 	;;
@@ -85,8 +87,6 @@ rb-2011uas |\
 rb-2011uias |\
 rb-2011uas-2hnd|\
 rb-2011uias-2hnd)
-	ucidef_set_interfaces_lan_wan "eth0.1 eth1" "eth0.2"
-
 	case "$board" in
 	rb-2011uas* | rb-2011uias | rb-2011uias-2hnd)
 		ucidef_add_switch "switch0" \
@@ -162,7 +162,6 @@ rb-750gl |\
 rb-751g |\
 rb-951g-2hnd |\
 wzr-hp-g450h)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "2:lan" "3:lan" "4:lan" "5:lan" "1:wan"
 	;;
@@ -182,7 +181,6 @@ rb-493g)
 wzr-hp-g300nh2 |\
 pb92 |\
 ap113)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "2:wan"
 	;;
@@ -195,19 +193,16 @@ el-m150)
 
 tl-wdr4300|\
 tl-wr1041n-v2)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
-		"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
+		"0@eth0" "1:wan" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4"
 	;;
 
 tl-wr1043nd)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
 	;;
 
 tl-wr2543n)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "9@eth0"
 	;;
@@ -238,13 +233,11 @@ wnr1000-v2)
 	;;
 
 uap-pro)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan" "2:wan"
 	;;
 
 nanostation-m-xw)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "5:lan" "1:wan"
 	;;
@@ -261,10 +254,15 @@ wzr-hp-g300nh)
 		"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
 	;;
 
+cr3000)
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth1"
+	ucidef_add_switch "switch0"  \
+		"0@eth0" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
+	;;
+
 dgl-5500-a1 |\
 dir-825-c1)
 	local mac
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
 	mac=$(mtd_get_mac_ascii nvram "wan_mac")
@@ -273,7 +271,6 @@ dir-825-c1)
 
 mynet-n750)
 	local mac
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
 	mac=$(mtd_get_mac_ascii devdata "wanmac")
@@ -288,7 +285,6 @@ dhp-1565-a1 |\
 dir-835-a1 |\
 wndr3700v4 | \
 wndr4300)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
 	mac_lan=$(mtd_get_mac_binary caldata 0)
@@ -299,7 +295,6 @@ wndr4300)
 
 esr900)
 	local mac
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
 	mac=$(mtd_get_mac_ascii u-boot-env "wanaddr")
@@ -330,6 +325,7 @@ eap7660d |\
 el-mini |\
 loco-m-xw |\
 mr1750 |\
+mr18 |\
 mr600 |\
 mr600v2 |\
 mr900 |\
@@ -367,6 +363,10 @@ wp543)
 	ucidef_set_interface_lan "eth0"
 	;;
 
+cap324)
+	ucidef_set_interface_lan "eth0" "dhcp"
+	;;
+
 arduino-yun | \
 dir-505-a1)
 	ucidef_set_interface_lan "eth1"
@@ -395,7 +395,6 @@ gl-ar300)
 	;;
 
 wpj344)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "3:lan" "2:wan"
 	;;
@@ -405,7 +404,6 @@ wpj531)
 	;;
 
 wpj558)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"5:lan" "1:wan" "6@eth0"
 	;;
@@ -449,13 +447,11 @@ wzr-hp-ag300h)
 	;;
 
 wzr-hp-g450h)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "2:lan:1 3:lan:2 4:lan:3 5:lan:4" "1:wan"
 	;;
 
 ew-dorin)
-	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 	ucidef_add_switch "switch0" \
 		"0@eth0" "1:lan" "2:lan" "3:wan"
 	;;