X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Fetc%2Fuci-defaults%2F02_network;h=133c2decb9a031c0f4e8d264e5613c684ceb785d;hp=b6fff7a2ccaac48e76c8c0eb5e739d53d9b40a37;hb=9eb2dd5bb4be0bbbb47be056dce9aed88da16ed9;hpb=0c46f343b30717e31fe424e7e30a7a0c2e4a2dce

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 b6fff7a2cc..133c2decb9 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network
@@ -4,11 +4,6 @@
 . /lib/ramips.sh
 . /lib/functions/uci-defaults.sh
 
-if [ ! -x /usr/sbin/maccalc ]; then
-	echo "$0: maccalc not found!"
-	return
-fi
-
 ramips_setup_rt3x5x_vlans()
 {
 	if [ ! -x /sbin/swconfig ]; then
@@ -18,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
@@ -43,14 +37,18 @@ ramips_setup_interfaces()
 
 	case $board in
 	3g300m | \
+	w150m | \
 	all0256n | \
 	all5002 | \
-	broadway)
+	all5003 | \
+	awm002-evb | \
+	broadway | \
+	wnce2001)
 		ucidef_add_switch "switch0" "1" "0"
 		ucidef_set_interface_lan "eth0"
 		;;
 
-	dir-615-h1 | \
+	3g-6200nl | \
 	wl-330n)
 		ucidef_set_interface_lan "eth0.1"
 		;;
@@ -66,6 +64,12 @@ ramips_setup_interfaces()
 		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"
+		;;
+
 	dir-645)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
@@ -73,6 +77,7 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "2" "0 6t"
 		;;
 
+	dir-615-h1 | \
 	mzk-w300nh2)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
@@ -82,6 +87,14 @@ ramips_setup_interfaces()
 
 	f5d8235-v1 | \
 	f5d8235-v2 | \
+	hg255d | \
+	ur-326n4g)
+		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"
+		;;
+
 	ur-336un)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		;;
@@ -117,11 +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"
 		;;
 
+	d105 | \
 	omni-emb-hpm|\
 	wli-tx4-ag300n)
 		ucidef_set_interface_lan "eth0"
@@ -148,105 +161,124 @@ ramips_setup_macs()
 	all0256n | \
 	all5002 | \
 	dir-615-h1)
-		lan_mac=$(ramips_get_mac_binary factory 40)
+		lan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 	3g-6200n | \
 	3g300m | \
+	w150m | \
 	air3gii | \
 	argus-atp52b | \
 	bc2 | \
 	br6425 | \
 	broadway | \
+	dir-620-d1 | \
 	f5d8235-v1 | \
+	mpr-a1 | \
+	mpr-a2 | \
 	mzk-w300nh2 | \
 	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=$(mtd_get_mac_binary factory 4)
+		wan_mac=$(macaddr_add "$lan_mac" 1)
+		;;
+
+	asl26555)
+		lan_mac=$(mtd_get_mac_binary devdata 16388)
 		;;
 
 	w306r-v20)
-		lan_mac=$(ramips_get_mac_binary factory 4)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 5)
+		lan_mac=$(mtd_get_mac_binary factory 4)
+		wan_mac=$(macaddr_add "$lan_mac" 5)
 		;;
 
 	rt-n13u | \
+	hg255d	| \
 	fonera20n)
-		lan_mac=$(ramips_get_mac_binary factory 40)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		lan_mac=$(mtd_get_mac_binary factory 40)
+		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
 	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=$(mtd_get_mac_binary devdata 16388)
+		wan_mac=$(macaddr_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)
+		lan_mac=$(mtd_get_mac_binary factory 4)
+		lan_mac=$(macaddr_setbit_la "$lan_mac")
+		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
 	dir-645)
-		lan_mac=$(ramips_get_mac_nvram nvram lanmac)
-		wan_mac=$(ramips_get_mac_nvram nvram wanmac)
+		lan_mac=$(mtd_get_mac_ascii nvram lanmac)
+		wan_mac=$(mtd_get_mac_ascii nvram wanmac)
 		;;
 
 	esr-9753 | \
+	ur-326n4g | \
 	ur-336un)
-		lan_mac=$(ramips_get_mac_binary devdata 16388)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		lan_mac=$(mtd_get_mac_binary devdata 16388)
+		wan_mac=$(macaddr_add "$lan_mac" 1)
+		;;
+
+	m3 |\
+	m4)
+		lan_mac=$(mtd_get_mac_binary factory 4)
+		lan_mac=$(macaddr_add "$lan_mac" -1)
 		;;
 
 	nbg-419n | \
 	wcr-150gn)
-                lan_mac=$(ramips_get_mac_binary factory 4)
-                wan_mac=$(ramips_get_mac_binary factory 40)
+                lan_mac=$(mtd_get_mac_binary factory 4)
+                wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 
 	omni-emb-hpm)
-		lan_mac=$(ramips_get_mac_binary factory 40)
+		lan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 
 	f5d8235-v2)
-		lan_mac=$(ramips_get_mac_binary "u-boot" 262148)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		lan_mac=$(mtd_get_mac_binary "u-boot" 262148)
+		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
 	rt-n56u)
-		lan_mac=$(ramips_get_mac_binary factory 4)
-		wan_mac=$(ramips_get_mac_binary factory 32772)
+		lan_mac=$(mtd_get_mac_binary factory 4)
+		wan_mac=$(mtd_get_mac_binary factory 32772)
 		;;
 
 	tew-691gr)
-		lan_mac=$(ramips_get_mac_binary factory 40)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 3)
+		lan_mac=$(mtd_get_mac_binary factory 40)
+		wan_mac=$(macaddr_add "$lan_mac" 3)
 		;;
 
 	tew-692gr)
-		lan_mac=$(ramips_get_mac_binary factory 40)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 4)
+		lan_mac=$(mtd_get_mac_binary factory 40)
+		wan_mac=$(macaddr_add "$lan_mac" 4)
 		;;
 
 	all0239-3g | \
 	carambola | \
-	w502u)
-		lan_mac=$(ramips_get_mac_binary factory 40)
-		wan_mac=$(ramips_get_mac_binary factory 46)
+	freestation5 | \
+	w502u | \
+	wnce2001)
+		lan_mac=$(mtd_get_mac_binary factory 40)
+		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
 
 	wl341v3)
-		lan_mac=$(ramips_get_mac_binary board-nvram 65440)
-		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
+		lan_mac=$(mtd_get_mac_binary board-nvram 65440)
+		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
 
+	d105 | \
 	wli-tx4-ag300n)
-		lan_mac=$(ramips_get_mac_binary factory 4)
+		lan_mac=$(mtd_get_mac_binary factory 4)
 		;;
 
 	esac