[package] base-file: cleanup ipv6 enabling in unbridge
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 12 Feb 2011 16:14:15 +0000 (16:14 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 12 Feb 2011 16:14:15 +0000 (16:14 +0000)
SVN-Revision: 25473

package/base-files/files/lib/network/config.sh

index aa90077ad9e9d2ff1c6e7e8dc21284316b0c2197..def1562901b5bfd110465cd6f58f4eb74fdc5d7d 100755 (executable)
@@ -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
 
                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
        }
 }
                done
        }
 }