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=d20b60af06054e1b30b6b7a231f4692f1d4e9b14;hp=e58accd181f7ecbb4e5044c48642533358a6da78;hb=0464c077a45816efde6382621cbe13a5bbee3474;hpb=1fe43c4a68da43f9b18c150af08388bb6cb8325e

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index e58accd181..d20b60af06 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -2,126 +2,212 @@
 
 . /etc/functions.sh
 . /lib/ramips.sh
+. /lib/functions/uci-defaults.sh
 
 if [ ! -x /usr/sbin/maccalc ]; then
 	echo "$0: maccalc not found!"
 	return
 fi
 
-create_lan_wan()
+ramips_setup_rt3x5x_vlans()
 {
-	uci batch <<EOF
-set network.lan.ifname=eth0.1
-set network.wan=interface
-set network.wan.ifname=eth0.2
-set network.wan.proto=dhcp
-commit network
-EOF
+	if [ ! -x /sbin/swconfig ]; then
+		# legacy default
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		return
+	fi
+	local wanports=""
+	local lanports=""
+	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"
 }
 
-get_mac_binary()
+ramips_setup_interfaces()
 {
-	local mtdname="$1"
-	local seek="$2"
-	local part
+	local board="$1"
 
-	part=$(find_mtd_part "$mtdname")
-	if [ -z "$part" ]; then
-		echo "get_mac_binary: partition $mtdname not found!" >&2
-		return
-	fi
+	ucidef_set_interface_loopback
 
-	dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac
-}
+	case $board in
+	all0256n | \
+	all5002 | \
+	dir-615-h1 | \
+	wl-330n)
+		ucidef_set_interface_lan "eth0.1"
+		;;
 
-get_mac_nvram()
-{
-	local mtdname="$1"
-	local key="$2"
-	local part
-	local mac_dirty
-
-	part=$(find_mtd_part "$mtdname")
-	if [ -z "$part" ]; then
-		echo "get_mac_nvram: partition $mtdname not found!" >&2
-		return
-	fi
+	3g-6200n | \
+	argus-atp52b | \
+	b2c | \
+	nw718 | \
+	psr-680w | \
+	sl-r7205 | \
+	w502u | \
+	wr6202)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		;;
 
-	mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
-	# "canonicalize" mac
-	maccalc add "$mac_dirty" 0
-}
+	f5d8235-v1 | \
+	f5d8235-v2 | \
+	ur-336un)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		;;
 
-set_macs()
-{
-	local lan_mac="$1"
-	local wan_mac="$2"
+	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"
+		;;
 
-	echo "Setting LAN mac address to: $lan_mac" >&2
-	echo "Setting WAN mac address to: $wan_mac" >&2
+	rt-n15 | \
+	wl-351)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		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"
+		;;
 
-	uci batch <<EOF
-set network.lan.macaddr='$lan_mac'
-set network.wan.macaddr='$wan_mac'
-commit network
-EOF
-}
+	rt-n56u)
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		ucidef_add_switch "switch0" "1" "1"
+		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 8t"
+		ucidef_add_switch_vlan "switch0" "2" "4 8t"
+		;;
 
-set_macs_only_lan()
-{
-	local lan_mac="$1"
-	local wan_mac
+	freestation5 | \
+	wcr-150gn)
+		ucidef_set_interfaces_lan_wan "eth0.2" "eth0.1"
+		;;
 
-	wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+	wli-tx4-ag300n)
+		ucidef_set_interface_lan "eth0"
+		;;
 
-	set_macs "$lan_mac" "$wan_mac"
+	*)
+		RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
+		if [ -n "${RT3X5X}" ]; then
+			ramips_setup_rt3x5x_vlans
+		else
+			ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		fi
+		;;
+	esac
 }
 
-set_macs_only_lan_from_mtd()
+ramips_setup_macs()
 {
-	local mtdname="$1"
-	local seek="$2"
-	local lan_mac
+	local board="$1"
+	local lan_mac=""
+	local wan_mac=""
+
+	case $board in
+	all0256n | \
+	all5002 | \
+	dir-615-h1)
+		lan_mac=$(ramips_get_mac_binary factory 40)
+		;;
+	3g-6200n | \
+	argus-atp52b | \
+	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)
+		;;
 
-	lan_mac=$(get_mac_binary "$mtdname" "$seek")
-	if [ -z $lan_mac ]; then
-		echo "set_macs_only_lan_from_mtd: can't extract mac address from $part" >&2
-		return
-	fi
+	w306r-v20)
+		lan_mac=$(ramips_get_mac_binary factory 4)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5)
+		;;
 
-	set_macs_only_lan "$lan_mac"
-}
+	fonera20n)
+		lan_mac=$(ramips_get_mac_binary factory 40)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		;;
 
-set_macs_only_lan_from_nvram()
-{
-	local mtdname="$1"
-	local key="$2"
-	local lan_mac
+	dir-300-b1 |\
+	dir-300-b2 |\
+	dir-600-b1)
+		lan_mac=$(ramips_get_mac_binary devdata 16388)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		;;
 
-	lan_mac=$(get_mac_nvram "$mtdname" "$key")
-	if [ -z $lan_mac ]; then
-		echo "set_macs_only_lan_from_nvram: can't extract mac address from $part" >&2
-		return
-	fi
+	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)
+		;;
 
-	set_macs_only_lan "$lan_mac"
-}
+	esr-9753 | \
+	ur-336un)
+		lan_mac=$(ramips_get_mac_binary devdata 16388)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		;;
 
-board=$(ramips_board_name)
+	nbg-419n | \
+	wcr-150gn)
+                lan_mac=$(ramips_get_mac_binary factory 4)
+                wan_mac=$(ramips_get_mac_binary factory 40)
+		;;
 
-case $board in
 	f5d8235-v2)
-		create_lan_wan
-		set_macs_only_lan_from_mtd "u-boot" 262148
+		lan_mac=$(ramips_get_mac_binary "u-boot" 262148)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
 		;;
-	argus-atp52b | \
-	b2c | \
-	nw718)
-		create_lan_wan
-		set_macs_only_lan_from_mtd "factory" 4
+
+	rt-n56u)
+		lan_mac=$(ramips_get_mac_binary factory 4)
+		wan_mac=$(ramips_get_mac_binary factory 32772)
 		;;
-	*)
-		RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
-		[ -z "${RT3X5X}" ] || create_lan_wan
+
+	all0239-3g | \
+	carambola | \
+	w502u)
+		lan_mac=$(ramips_get_mac_binary factory 40)
+		wan_mac=$(ramips_get_mac_binary factory 46)
+		;;
+
+	wl341v3)
+		lan_mac=$(ramips_get_mac_binary board-nvram 65440)
+		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		;;
+
+	wli-tx4-ag300n)
+		lan_mac=$(ramips_get_mac_binary factory 4)
 		;;
-esac
+
+	esac
+
+	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
+	[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac
+}
+
+[ -e /etc/config/network ] && exit 0
+
+touch /etc/config/network
+
+board=$(ramips_board_name)
+
+ramips_setup_interfaces $board
+ramips_setup_macs $board
+
+uci commit network
+
+exit 0