From eb82e0d7a180f372ef81ccb3dacac420c05be602 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 6 Dec 2009 09:07:53 +0000 Subject: [PATCH] fix the handling of MAC addresses with r6040, patch from rtz SVN-Revision: 18669 --- target/linux/rdc/base-files/etc/preinit.arch | 29 +++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/target/linux/rdc/base-files/etc/preinit.arch b/target/linux/rdc/base-files/etc/preinit.arch index 8f21b1f9ed..fd456f8b23 100644 --- a/target/linux/rdc/base-files/etc/preinit.arch +++ b/target/linux/rdc/base-files/etc/preinit.arch @@ -1,8 +1,23 @@ -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org -ash -c ". /etc/functions.sh -hdr=\$(find_mtd_part productinfo) -[ \$(find_mtd_part productinfo_parthdr) ] || rev=reverse -[ \"\$hdr\" ] && mac=\$(hexdump -n 6 -e '6/1 \",0x%X\"' \$hdr |cut -c2-) -[ \"\$mac\" = \"0x0,0x0,0x0,0x0,0x0,0x0\" ] && unset mac -[ \"\$mac\" ] && insmod r6040 \$rev mac_base=\$mac" +. /etc/functions.sh + +insmod r6040 + +kernel=$(grep magic /proc/mtd | awk -F: '{print $1}') +[ -n $kernel ] && hdr=$(dd if=/dev/$kernel count=4 bs=1 2> /dev/null) +[ "$hdr" = "CSYS" ] && config=$(find_mtd_part config) +if [ -n "$config" ]; then + mac0=$(hexdump -n 6 -e '6/1 ":%X"' -s 24583 $config | cut -c2-) + [ "$mac0" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac0 + mac1=$(hexdump -n 6 -e '6/1 ":%X"' -s 24589 $config | cut -c2-) + [ "$mac1" = "FF:FF:FF:FF:FF:FF" -o "$mac0" = "0:0:0:0:0:0" ] && unset mac1 +fi +if [ -n $mac0 ]; then + logger -t kernel -p user.info "r6040: Setting MAC for eth0 to $mac0" + ifconfig eth0 hw ether $mac0 +fi +if [ -n $mac1 ]; then + logger -t kernel -p user.info "r6040: Setting MAC for eth1 to $mac1" + ifconfig eth1 hw ether $mac1 +fi -- 2.25.1