X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Framips%2Fbase-files%2Fetc%2Fuci-defaults%2Fnetwork;h=dff0fd66f8aacac85971f6b922409bde829ae97c;hb=b53681bd3573d026c2b8e7ca470ad455eb62884e;hp=cbb0b85ff4cfdcaa36f272113812118d90586b80;hpb=0618ae4136933b66a4df070be842ba0ae2e27adc;p=openwrt.git

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index cbb0b85ff4..dff0fd66f8 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -9,6 +9,32 @@ if [ ! -x /usr/sbin/maccalc ]; then
 	return
 fi
 
+ramips_setup_rt3x5x_vlans()
+{
+	if [ ! -x /sbin/swconfig ]; then
+		# legacy default
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		return
+	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
+		fi
+		if [ `swconfig dev rt305x port $port get lan` = "0" ]; then
+			wanports="$port $wanports"
+		else
+			lanports="$port $lanports"
+		fi
+	done
+	ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+	ucidef_add_switch "rt305x" "1" "1"
+	ucidef_add_switch_vlan "rt305x" "1" "$lanports 6t"
+	ucidef_add_switch_vlan "rt305x" "2" "$wanports 6t"
+}
+
 ramips_setup_interfaces()
 {
 	local board="$1"
@@ -17,7 +43,11 @@ ramips_setup_interfaces()
 
 	case $board in
 	all0256n | \
-	all5002 | \
+	all5002)
+		ucidef_set_interface_lan "eth0"
+		;;
+
+	dir-615-h1 | \
 	wl-330n)
 		ucidef_set_interface_lan "eth0.1"
 		;;
@@ -33,6 +63,13 @@ ramips_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		;;
 
+	dir-645)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		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"
+		;;
+
 	f5d8235-v1 | \
 	f5d8235-v2 | \
 	ur-336un)
@@ -61,6 +98,14 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "2" "4 8t"
 		;;
 
+	tew-691gr|\
+	tew-692gr)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		ucidef_add_switch "switch0" "1" "1"
+		ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
+		ucidef_add_switch_vlan "switch0" "2" "0t 5"
+		;;
+
 	freestation5 | \
 	wcr-150gn)
 		ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1"
@@ -71,9 +116,9 @@ ramips_setup_interfaces()
 		;;
 
 	*)
-		RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
+		RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350)"`
 		if [ -n "${RT3X5X}" ]; then
-			ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+			ramips_setup_rt3x5x_vlans
 		else
 			ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		fi
@@ -89,7 +134,8 @@ ramips_setup_macs()
 
 	case $board in
 	all0256n | \
-	all5002)
+	all5002 | \
+	dir-615-h1)
 		lan_mac=$(ramips_get_mac_binary factory 40)
 		;;
 	3g-6200n | \
@@ -110,6 +156,7 @@ ramips_setup_macs()
 		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5)
 		;;
 
+	rt-n13u | \
 	fonera20n)
 		lan_mac=$(ramips_get_mac_binary factory 40)
 		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
@@ -128,6 +175,11 @@ ramips_setup_macs()
 		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
 		;;
 
+	dir-645)
+		lan_mac=$(ramips_get_mac_nvram nvram lanmac)
+		wan_mac=$(ramips_get_mac_nvram nvram wanmac)
+		;;
+
 	esr-9753 | \
 	ur-336un)
 		lan_mac=$(ramips_get_mac_binary devdata 16388)
@@ -150,9 +202,21 @@ ramips_setup_macs()
 		wan_mac=$(ramips_get_mac_binary factory 32772)
 		;;
 
+	tew-691gr)
+		lan_mac=$(ramips_get_mac_binary factory 40)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3)
+		;;
+
+	tew-692gr)
+		lan_mac=$(ramips_get_mac_binary factory 40)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4)
+		;;
+
+	all0239-3g | \
+	carambola | \
 	w502u)
-                lan_mac=$(ramips_get_mac_binary factory 40)
-                wan_mac=$(ramips_get_mac_binary factory 46)
+		lan_mac=$(ramips_get_mac_binary factory 40)
+		wan_mac=$(ramips_get_mac_binary factory 46)
 		;;
 
 	wl341v3)