X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/370e79ea76aabc5e201002fdf7b742c50e89c997..fcef96a4885f7f50135e2124348503ded4662149:/package/base-files/files/lib/network/config.sh?ds=sidebyside

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index aa90077ad..9489ccf95 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -186,11 +186,11 @@ prepare_interface() {
 					config_get_bool stp "$config" stp 0
 					$DEBUG brctl addbr "br-$config"
 					$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
+					$DEBUG ifconfig "br-$config" up
 					# Creating the bridge here will have triggered a hotplug event, which will
 					# result in another setup_interface() call, so we simply stop processing
 					# the current event at this point.
@@ -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
 	}
 }