aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-05-24 09:31:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-05-24 09:31:37 +0000
commit60f66ded72b1680d54082e449330ec52b02258b7 (patch)
tree7d1f39ca118909f0b6cb21028ac6dcade8bad93e
parenta02ba6ccc2fab27905ec74da719f7a298fedf8d7 (diff)
downloadupstream-60f66ded72b1680d54082e449330ec52b02258b7.tar.gz
upstream-60f66ded72b1680d54082e449330ec52b02258b7.tar.bz2
upstream-60f66ded72b1680d54082e449330ec52b02258b7.zip
base-files: make the MAC address of bridge interfaces sticky to avoid ARP issues on wifi re-configuration
SVN-Revision: 26990
-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.