summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-24 09:31:37 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-24 09:31:37 +0000
commit5ba8c47f8661b6589b3e20a865cab693b96ef2a3 (patch)
tree3448653e100b09977fee478cdf3c8c7d2e20414b
parentda928e0fd64b3b813fc929ca252a3888f8f6493e (diff)
base-files: make the MAC address of bridge interfaces sticky to avoid ARP issues on wifi re-configuration
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26990 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 9489ccf95e..c262282faa 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -190,7 +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
- $DEBUG ifconfig "br-$config" up
+ [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)"
+ $DEBUG ifconfig "br-$config" 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.