From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 12 Feb 2011 16:14:15 +0000 (+0000)
Subject: base-file: cleanup ipv6 enabling in unbridge
X-Git-Tag: reboot~17597
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee3a4c2ee9323592534177f9029ac3b4a1f8ca0c;p=openwrt%2Fstaging%2Flynxis.git

base-file: cleanup ipv6 enabling in unbridge

SVN-Revision: 25473
---

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index aa90077ad9..def1562901 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -416,9 +416,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
-			[ "${dev##wlan}" != "$dev" ] && \
-				do_sysctl net.ipv6.conf.mon.$dev.disable_ipv6 0
+			do_sysctl "net.ipv6.conf.$dev.disable_ipv6" 0
 		done
 	}
 }