X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3c681484c220f1dbfd5ba2dba1e14687696f4a0a..e310d5b786eb4c7e461f0aa609b3d3642db95465:/target/linux/ramips/base-files/etc/uci-defaults/network

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 6f2843ba2..f78f9bf9d 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -9,39 +9,6 @@ if [ ! -x /usr/sbin/maccalc ]; then
 	return
 fi
 
-get_mac_binary()
-{
-	local mtdname="$1"
-	local seek="$2"
-	local part
-
-	part=$(find_mtd_part "$mtdname")
-	if [ -z "$part" ]; then
-		echo "get_mac_binary: partition $mtdname not found!" >&2
-		return
-	fi
-
-	dd bs=1 skip=$seek count=6 if=$part 2>/dev/null | /usr/sbin/maccalc bin2mac
-}
-
-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
-
-	mac_dirty=$(strings "$part" | sed -n 's/'"$key"'=//p')
-	# "canonicalize" mac
-	maccalc add "$mac_dirty" 0
-}
-
 ramips_setup_interfaces()
 {
 	local board="$1"
@@ -53,7 +20,7 @@ ramips_setup_interfaces()
 	b2c | \
 	f5d8235-v2 | \
 	nw718)
-		ucidef_set_interfaces_lan_wan "eth0.1 eth0.2"
+		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		;;
 
 	rt-n15)
@@ -66,9 +33,9 @@ ramips_setup_interfaces()
 	*)
 		RT3X5X=`cat /proc/cpuinfo | grep RT3.5`
 		if [ -n "${RT3X5X}" ]; then
-			ucidef_set_interfaces_lan_wan "eth0.1 eth0.2"
+			ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		else
-			ucidef_set_interfaces_lan_wan "eth0 eth1"
+			ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		fi
 		;;
 	esac
@@ -82,7 +49,7 @@ ramips_setup_macs()
 
 	case $board in
 	f5d8235-v2)
-		lan_mac=$(get_mac_nvram "u-boot" 262148)
+		lan_mac=$(ramips_get_mac_nvram "u-boot" 262148)
 		wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
 		;;
 
@@ -90,9 +57,21 @@ ramips_setup_macs()
 	b2c | \
 	nw718 | \
 	rt-n15)
-		lan_mac=$(get_mac_binary factory 4)
+		lan_mac=$(ramips_get_mac_binary factory 4)
 		wan_mac=$(/usr/sbin/maccalc 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)
+		;;
+
+	nbg-419n)
+                lan_mac=$(ramips_get_mac_binary factory 4)
+                wan_mac=$(ramips_get_mac_binary factory 40)
+		;;
 	esac
 
 	[ -n $lan_mac ] && ucidef_set_interface_macaddr lan $lan_mac