X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Fetc%2Fuci-defaults%2F02_network;h=a9914fdb872d77c8e691e3d73fbf07cb7d132ff4;hb=9739a0b41baa88c233f76b93ac01805b7b635d94;hp=9c1936e571f35ea1f304b26a9777a03443875975;hpb=df7af06f1f830f7c319e41a9459d26021ca1ee9f;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network
index 9c1936e571..a9914fdb87 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network
@@ -13,7 +13,6 @@ ramips_setup_rt3x5x_vlans()
 	fi
 	local wanports=""
 	local lanports=""
-	swconfig dev rt305x set reset 1
 	for port in 5 4 3 2 1 0; do
 		if [ `swconfig dev rt305x port $port get disable` = "1" ]; then
 			continue
@@ -41,18 +40,22 @@ ramips_setup_interfaces()
 	w150m | \
 	all0256n | \
 	all5002 | \
-	broadway)
+	all5003 | \
+	awm002-evb | \
+	broadway | \
+	dcs-930| \
+	wnce2001)
 		ucidef_add_switch "switch0" "1" "0"
 		ucidef_set_interface_lan "eth0"
 		;;
 
 	3g-6200nl | \
-	wl-330n)
+	wl-330n | \
+	wmr300)
 		ucidef_set_interface_lan "eth0.1"
 		;;
 
 	3g-6200n | \
-	argus-atp52b | \
 	b2c | \
 	nw718 | \
 	psr-680w | \
@@ -62,13 +65,15 @@ ramips_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		;;
 
-	dir-645)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	asl26555)
+		ucidef_set_interface_lan "eth0.1"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 6t"
-		ucidef_add_switch_vlan "switch0" "2" "0 6t"
 		;;
 
+	dir-610-a1 | \
+	dir-300-b7 | \
+	dir-320-b1 | \
 	dir-615-h1 | \
 	mzk-w300nh2)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
@@ -77,8 +82,12 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "2" "4 6t"
 		;;
 
+	argus-atp52b | \
+	dir-645 | \
 	f5d8235-v1 | \
 	f5d8235-v2 | \
+	hg255d | \
+	rt-n14u | \
 	ur-326n4g)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
@@ -121,9 +130,11 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "2" "0t 5"
 		;;
 
-	freestation5 | \
 	wcr-150gn)
-		ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1"
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		ucidef_add_switch "switch0" "1" "1"
+		ucidef_add_switch_vlan "switch0" "1" "0 6t"
+		ucidef_add_switch_vlan "switch0" "2" "6t"
 		;;
 
 	d105 | \
@@ -137,7 +148,7 @@ ramips_setup_interfaces()
 		if [ -n "${RT3X5X}" ]; then
 			ramips_setup_rt3x5x_vlans
 		else
-			ucidef_set_interfaces_lan_wan "eth0" "eth1"
+			ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		fi
 		;;
 	esac
@@ -150,50 +161,30 @@ ramips_setup_macs()
 	local wan_mac=""
 
 	case $board in
-	all0256n | \
-	all5002 | \
-	dir-615-h1)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		;;
-	3g-6200n | \
-	3g300m | \
-	w150m | \
-	air3gii | \
-	argus-atp52b | \
-	bc2 | \
-	br6425 | \
-	broadway | \
-	f5d8235-v1 | \
-	mzk-w300nh2 | \
-	nw718 | \
-	psr-680w | \
-	rt-n15 | \
-	sl-r7205 | \
-	wl-351)
-		lan_mac=$(mtd_get_mac_binary factory 4)
+	*)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
 	w306r-v20)
-		lan_mac=$(mtd_get_mac_binary factory 4)
 		wan_mac=$(macaddr_add "$lan_mac" 5)
 		;;
 
-	rt-n13u | \
-	fonera20n)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
+	tew-691gr)
+		wan_mac=$(macaddr_add "$lan_mac" 3)
 		;;
 
-	dir-300-b1 |\
-	dir-300-b2 |\
-	dir-600-b1)
-		lan_mac=$(mtd_get_mac_binary devdata 16388)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
+	tew-692gr)
+		wan_mac=$(macaddr_add "$lan_mac" 4)
+		;;
+
+	m3 |\
+	m4 |\
+	x5 |\
+	x8)
+		lan_mac=$(macaddr_add "$lan_mac" -1)
 		;;
 
 	dir-620-a1)
-		lan_mac=$(mtd_get_mac_binary factory 4)
 		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
@@ -203,47 +194,20 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_ascii nvram wanmac)
 		;;
 
-	esr-9753 | \
-	ur-326n4g | \
-	ur-336un)
-		lan_mac=$(mtd_get_mac_binary devdata 16388)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
-		;;
-
 	nbg-419n | \
 	wcr-150gn)
-                lan_mac=$(mtd_get_mac_binary factory 4)
                 wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 
-	omni-emb-hpm)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		;;
-
-	f5d8235-v2)
-		lan_mac=$(mtd_get_mac_binary "u-boot" 262148)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
-		;;
-
 	rt-n56u)
-		lan_mac=$(mtd_get_mac_binary factory 4)
 		wan_mac=$(mtd_get_mac_binary factory 32772)
 		;;
 
-	tew-691gr)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		wan_mac=$(macaddr_add "$lan_mac" 3)
-		;;
-
-	tew-692gr)
-		lan_mac=$(mtd_get_mac_binary factory 40)
-		wan_mac=$(macaddr_add "$lan_mac" 4)
-		;;
-
 	all0239-3g | \
 	carambola | \
-	w502u)
-		lan_mac=$(mtd_get_mac_binary factory 40)
+	freestation5 | \
+	w502u | \
+	wnce2001)
 		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
 
@@ -252,11 +216,6 @@ ramips_setup_macs()
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
-	d105 | \
-	wli-tx4-ag300n)
-		lan_mac=$(mtd_get_mac_binary factory 4)
-		;;
-
 	esac
 
 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac