From d9a08bece428ac8a575d17fc154e38e5ca3b1fd7 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 12 Feb 2011 16:15:18 +0000
Subject: [PATCH] [backfire] merge r24194, r25471 (#8845)

SVN-Revision: 25474
---
 package/base-files/files/lib/network/config.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 9e4128bc95..d9bd5cead7 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
 	}
 }
-- 
2.30.2