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

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index a36341ca15..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"
@@ -16,31 +42,53 @@ ramips_setup_interfaces()
 	ucidef_set_interface_loopback
 
 	case $board in
-	all0256n)
+	all0256n | \
+	all5002)
+		ucidef_set_interface_lan "eth0"
+		;;
+
+	dir-615-h1 | \
+	wl-330n)
 		ucidef_set_interface_lan "eth0.1"
 		;;
 
+	3g-6200n | \
 	argus-atp52b | \
 	b2c | \
 	nw718 | \
+	psr-680w | \
+	sl-r7205 | \
 	w502u | \
 	wr6202)
 		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 | \
-	rt-n15)
+	f5d8235-v2 | \
+	ur-336un)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "rtl8366s" "1" "1"
-		ucidef_add_switch_vlan "rtl8366s" "1" "1 2 3 4 5t"
-		ucidef_add_switch_vlan "rtl8366s" "2" "0 5t"
 		;;
 
-	f5d8235-v2)
+	v11st-fe)
+		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 5t"
+		ucidef_add_switch_vlan "switch0" "2" "0 5t"
+		;;
+
+	rt-n15 | \
+	wl-351)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "rtl8366rb" "1" "1"
-		ucidef_add_switch_vlan "rtl8366rb" "1" "1 2 3 4 5t"
-		ucidef_add_switch_vlan "rtl8366rb" "2" "0 5t"
+		ucidef_add_switch "switch0" "1" "1"
+		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
+		ucidef_add_switch_vlan "switch0" "2" "4 5t"
 		;;
 
 	rt-n56u)
@@ -50,22 +98,17 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "2" "4 8t"
 		;;
 
-	v11st-fe)
+	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" "1 2 3 4 5t"
-		ucidef_add_switch_vlan "switch0" "2" "0 5t"
+		ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
+		ucidef_add_switch_vlan "switch0" "2" "0t 5"
 		;;
 
+	freestation5 | \
 	wcr-150gn)
-		ucidef_set_interface_lan_wan "eth0.2" "eth0.1"
-		;;
-
-	wl-351)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "rtl8366rb" "1" "1"
-		ucidef_add_switch_vlan "rtl8366rb" "1" "0 1 2 3 5t"
-		ucidef_add_switch_vlan "rtl8366rb" "2" "4 5t"
+		ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1"
 		;;
 
 	wli-tx4-ag300n)
@@ -73,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
@@ -90,20 +133,35 @@ ramips_setup_macs()
 	local wan_mac=""
 
 	case $board in
-	all0256n)
+	all0256n | \
+	all5002 | \
+	dir-615-h1)
 		lan_mac=$(ramips_get_mac_binary factory 40)
 		;;
-
+	3g-6200n | \
 	argus-atp52b | \
-	b2c | \
+	bc2 | \
 	f5d8235-v1 | \
 	nw718 | \
+	psr-680w | \
 	rt-n15 | \
+	sl-r7205 | \
 	wl-351)
 		lan_mac=$(ramips_get_mac_binary factory 4)
 		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
 		;;
 
+	w306r-v20)
+		lan_mac=$(ramips_get_mac_binary factory 4)
+		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)
+		;;
+
 	dir-300-b1 |\
 	dir-300-b2 |\
 	dir-600-b1)
@@ -111,7 +169,23 @@ ramips_setup_macs()
 		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
 		;;
 
+	dir-620-a1)
+		lan_mac=$(ramips_get_mac_binary factory 4)
+		lan_mac=$(maccalc or "$lan_mac" "02:00:00:00:00:00")
+		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)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		;;
+
 	nbg-419n | \
 	wcr-150gn)
                 lan_mac=$(ramips_get_mac_binary factory 4)
@@ -128,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)