X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Fpreinit%2F06_set_iface_mac;h=6712154dc4bf0b44282ea3079e057e76bc67dfcb;hp=7e2bac454786a92dfc0fb4af23d1639de1731399;hb=6bce4d5867016525d07d39a79dbdc4540ce62e2e;hpb=d3ca1d22b3c6358720aefccd0abca71a037fcc8c

diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
index 7e2bac4547..6712154dc4 100644
--- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
+++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
@@ -5,46 +5,58 @@
 preinit_set_mac_address() {
 	local mac
 
+	. /lib/functions.sh
 	. /lib/ramips.sh
 
 	case $(ramips_board_name) in
 	3g-6200n |\
+	3g-6200nl |\
+	3g300m | \
+	dir-620-d1 |\
+	w150m | \
+	mzk-w300nh2 |\
 	wl-330n |\
 	wl-330n3g)
-		mac=$(ramips_get_mac_binary factory 4)
+		mac=$(mtd_get_mac_binary factory 4)
 		ifconfig eth0 hw ether $mac 2>/dev/null
 		;;
 	bc2 |\
 	broadway |\
+	d105 |\
 	dir-620-a1 |\
 	esr-9753 |\
 	freestation5 |\
+	mpr-a1 | \
+	mpr-a2 | \
 	nw718 |\
 	psr-680w |\
 	rt-n56u |\
 	sl-r7205)
-		mac=$(ramips_get_mac_binary factory 4)
-		mac=$(maccalc or "$mac" "02:00:00:00:00:00")
+		mac=$(mtd_get_mac_binary factory 4)
+		mac=$(macaddr_setbit_la "$mac")
 		ifconfig eth0 hw ether $mac 2>/dev/null
 		;;
+	asl26555 |\
 	dir-300-b1 |\
 	dir-300-b2 |\
 	dir-600-b1)
-                mac=$(ramips_get_mac_binary devdata 16388)
+                mac=$(mtd_get_mac_binary devdata 16388)
                 ifconfig eth0 hw ether $mac 2>/dev/null
                 ;;
 	dir-645)
-		mac=$(ramips_get_mac_nvram nvram lanmac)
-		mac=$(maccalc or "$mac" "02:00:00:00:00:00")
+		mac=$(mtd_get_mac_ascii nvram lanmac)
+		mac=$(macaddr_setbit_la "$mac")
 		ifconfig eth0 hw ether $mac 2>/dev/null
 		;;
 	dap-1350)
-		mac=$(ramips_get_mac_binary devdata 46)
+		mac=$(mtd_get_mac_binary devdata 46)
 		ifconfig eth0 hw ether $mac 2>/dev/null
                 ;;
 	all0239-3g |\
 	all0256n |\
 	all5002 |\
+	all5003 |\
+	awm002-evb |\
 	carambola |\
 	dir-615-h1 |\
 	fonera20n |\
@@ -52,21 +64,31 @@ preinit_set_mac_address() {
 	hw550-3g |\
 	nbg-419n |\
 	omni-emb |\
+	omni-emb-hpm |\
 	tew-691gr |\
 	tew-692gr |\
 	w306r-v20 |\
 	w502u    |\
 	wr6202 |\
+	wnce2001 |\
 	xdxrn502j)
-		mac=$(ramips_get_mac_binary factory 40)
+		mac=$(mtd_get_mac_binary factory 40)
+		ifconfig eth0 hw ether $mac 2>/dev/null
+		;;
+	m3 |\
+	m4 |\
+	x5 |\
+	x8)
+		mac=$(mtd_get_mac_binary factory 4)
+		mac=$(macaddr_add "$mac" -1)
 		ifconfig eth0 hw ether $mac 2>/dev/null
 		;;
 	wl341v3)
-		mac=$(ramips_get_mac_binary board-nvram 65440)
+		mac=$(mtd_get_mac_binary board-nvram 65440)
 		ifconfig eth0 hw ether $mac 2>/dev/null
 		;;
 	rt-n10-plus)
-		mac=$(ramips_get_mac_binary devconf 4)
+		mac=$(mtd_get_mac_binary devconf 4)
 		ifconfig eth0 hw ether $mac 2>/dev/null
 		;;
 	esac