sunxi: ensure NanoPi R1 has unique MAC address

[openwrt/openwrt.git] / target / linux / rockchip / armv8 / base-files / etc / board.d / 02_network

diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
index b0e64799471c5c4a992ced6183ff12fd5691c208..816045a480318b0bf81966fde37159eeb18dccfd 100644 (file)
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
@@ -17,15 +17,6 @@ rockchip_setup_interfaces()
        esac
 }
 
-generate_mac_from_mmc_cid()
-{
-       local mmc_dev=$1
-
-       local sd_hash=$(sha256sum /sys/class/block/$mmc_dev/device/cid)
-       local mac_base=$(macaddr_canonicalize "$(echo "${sd_hash}" | dd bs=1 count=12 2>/dev/null)")
-       echo "$(macaddr_unsetbit_mc "$(macaddr_setbit_la "${mac_base}")")"
-}
-
 nanopi_r4s_get_mac()
 {
        local interface=$1
@@ -38,7 +29,7 @@ nanopi_r4s_get_mac()
                        address=$(macaddr_setbit_la "$address")
                fi
        else
-               address=$(generate_mac_from_mmc_cid mmcblk1)
+               address=$(macaddr_generate_from_mmc_cid mmcblk1)
                if [ "$interface" = "lan" ]; then
                        address=$(macaddr_add "$address" 1)
                fi
@@ -56,7 +47,7 @@ rockchip_setup_macs()
 
        case "$board" in
        friendlyarm,nanopi-r2s)
-               wan_mac=$(generate_mac_from_mmc_cid mmcblk0)
+               wan_mac=$(macaddr_generate_from_mmc_cid mmcblk0)
                lan_mac=$(macaddr_add "$wan_mac" 1)
                ;;
        friendlyarm,nanopi-r4s)