From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 27 May 2010 14:07:39 +0000 (+0000)
Subject: [backfire] backport bridge fix from r21577
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=356db59f1726acb5b3d9d96261da383727ff6012;p=10.03%2Fopenwrt.git

[backfire] backport bridge fix from r21577

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21581 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 1a77145f5..32170bb27 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -144,6 +144,8 @@ prepare_interface() {
 	config_get iftype "$config" type
 	case "$iftype" in
 		bridge)
+			local macaddr
+			config_get macaddr "$config" macaddr
 			[ -x /usr/sbin/brctl ] && {
 				ifconfig "br-$config" 2>/dev/null >/dev/null && {
 					local newdevs devices
@@ -168,7 +170,7 @@ prepare_interface() {
 					# result in another setup_interface() call, so we simply stop processing
 					# the current event at this point.
 				}
-				ifconfig "$iface" up 2>/dev/null >/dev/null
+				ifconfig "$iface" ${macaddr:+hw ether "${macaddr}"} up 2>/dev/null >/dev/null
 				return 1
 			}
 		;;