From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 24 May 2011 09:37:32 +0000 (+0000)
Subject: base-files: fix brcm-2.4 issues in r26991
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=e67170a64eaa60accbdfa5603f0cafcfed676ccc

base-files: fix brcm-2.4 issues in r26991

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26992 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 12e4912c0..be431e637 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -190,8 +190,8 @@ prepare_interface() {
 					$DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
 					$DEBUG brctl addif "br-$config" "$iface"
 					$DEBUG brctl stp "br-$config" $stp
-					[ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)"
-					$DEBUG ifconfig "br-$config" hw ether $macaddr up
+					[ -z "$macaddr" -a -e "/sys/class/net/$iface/address" ] && macaddr="$(cat /sys/class/net/$iface/address)"
+					$DEBUG ifconfig "br-$config" ${macaddr:+hw ether "${macaddr}"} up
 					# Creating the bridge here will have triggered a hotplug event, which will
 					# result in another setup_interface() call, so we simply stop processing
 					# the current event at this point.