summaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib/network
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-03 01:23:45 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-03 01:23:45 +0000
commit8d65fda8a8600a1feab909ba72dce2d49797f10f (patch)
tree8e477413abce87b01cdf2b018817173a6ee31596 /package/base-files/files/lib/network
parentd8d202d0a2aed330e8ca9d68bf9ee730e1661d41 (diff)
base-files: bridge config, avoid having a random ipv6 ll address
So far, we are setting the bridge interface up before having added any bridge interface ports. This results in the bridge assigning a random mac address to its bridge interface and therefore IPv6 assigning a matching link local address to the bridge interface as soon as the bridge interface is up. After adding the first bridge port interface, the bridge's mac address is reset correctly, however the IPv6 link local address stays the same. This commit ensures that we are at least having the IPv6 link local address of the first interface added to the bridge instead of a random one. Signed-off-by: Linus Lüssing <linus.luessing@web.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26426 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/lib/network')
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index def156290..9489ccf95 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -186,11 +186,11 @@ prepare_interface() {
config_get_bool stp "$config" stp 0
$DEBUG brctl addbr "br-$config"
$DEBUG brctl setfd "br-$config" 0
- $DEBUG ifconfig "br-$config" up
$DEBUG ifconfig "$iface" 0.0.0.0
$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
# 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.