qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

[backfire] backport r25454

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25455 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow
2011-02-11 00:42:01 +00:00
parent 85d6d57eaa
commit 6d44b9f998
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/base-files/files/lib/network/config.sh
View File

@@ -164,15 +164,6 @@ prepare_interface() {
local macaddr
config_get macaddr "$config" macaddr
[ -x /usr/sbin/brctl ] && {
# Remove IPv6 link local addr before adding the iface to the bridge
local llv6="$(ifconfig "$iface")"
case "$llv6" in
*fe80:*/64*)
llv6="${llv6#* fe80:}"
ifconfig "$iface" del "fe80:${llv6%% *}"
;;
esac
ifconfig "br-$config" 2>/dev/null >/dev/null && {
local newdevs devices
config_get devices "$config" device
@@ -181,6 +172,7 @@ prepare_interface() {
done
uci_set_state network "$config" device "$newdevs"
$DEBUG ifconfig "$iface" 0.0.0.0
$DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
$DEBUG brctl addif "br-$config" "$iface"
# Bridge existed already. No further processing necesary
} || {
@@ -190,6 +182,7 @@ prepare_interface() {
$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
# Creating the bridge here will have triggered a hotplug event, which will