From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 12 Feb 2011 16:15:18 +0000 (+0000)
Subject: [backfire] merge r24194, r25471 (#8845)
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=aba136d93a26be5b03fa4de5f6f73aa9dfdc6cf3

[backfire] merge r24194, r25471 (#8845)


git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25474 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 9e4128bc9..d9bd5cead 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -3,6 +3,12 @@
 
 # DEBUG="echo"
 
+do_sysctl() {
+	[ -n "$2" ] && \
+		sysctl -n -e -w "$1=$2" >/dev/null || \
+		sysctl -n -e "$1"
+}
+
 find_config() {
 	local iftype device iface ifaces ifn
 	for ifn in $interfaces; do
@@ -403,6 +409,7 @@ unbridge() {
 
 		for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
 			brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
+			do_sysctl "net.ipv6.conf.$dev.disable_ipv6" 0
 		done
 	}
 }