X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbase-files%2Fdefault%2Flib%2Fnetwork%2Fconfig.sh;h=a66c92bc033198a011debb05d382d6d23f03ca81;hb=b893c16ba2945513519c84592f5d06e20c62b175;hp=18f794a31b25a1c32d9366983d6d6cfaee30969a;hpb=bc75cb44a299a8e2ab9698948b3e97975765c70e;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 18f794a31b..a66c92bc03 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -70,6 +70,11 @@ setup_interface() {
 	proto="${3:-$(config_get "$config" proto)}"
 	config_get iftype "$config" type
 	
+	ifconfig "$iface" 2>/dev/null >/dev/null && {
+		# make sure the interface is removed from any existing bridge
+		unbridge "$iface"
+	}
+
 	# Setup VLAN interfaces
 	add_vlan "$iface"
 
@@ -141,3 +146,15 @@ setup_interface() {
 	esac
 }
 
+unbridge() {
+	local dev="$1"
+	local brdev
+
+	brctl show | grep "$dev" >/dev/null && {
+		# interface is still part of a bridge, correct that
+
+		for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
+			brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
+		done
+	}
+}