ramips: fix mac addresses on the DIR-300/600 boards

[openwrt.git] / 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 5891b48..f78f9bf 100755 (executable)
--- 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
 
-ramips_get_mac_binary()
-{
-       local mtdname="$1"
-       local seek="$2"
-       local part
-
-       part=$(find_mtd_part "$mtdname")
-       if [ -z "$part" ]; then
-               echo "ramips_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
-}
-
-ramips_get_mac_nvram()
-{
-       local mtdname="$1"
-       local key="$2"
-       local part
-       local mac_dirty
-
-       part=$(find_mtd_part "$mtdname")
-       if [ -z "$part" ]; then
-               echo "ramips_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"
@@ -93,6 +60,18 @@ ramips_setup_macs()
                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