X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f7d68e0a92d2978712aa6ebf610a300f5818948a..1c2ebc22c18d08f0f9c6055a518d2b8465c4db27:/package/base-files/default/lib/network/config.sh

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index ec05c3eb8..a66c92bc0 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -32,10 +32,11 @@ scan_interfaces() {
 			interface)
 				config_get proto "$CONFIG_SECTION" proto
 				append interfaces "$CONFIG_SECTION"
-				config_get iftype "$CONFIG_SECTION" iftype
+				config_get iftype "$CONFIG_SECTION" type
+				config_get ifname "$CONFIG_SECTION" ifname
+				config_set "$CONFIG_SECTION" device "$ifname"
 				case "$iftype" in
 					bridge)
-						config_get ifname "$CONFIG_SECTION" ifname
 						config_set "$CONFIG_SECTION" ifnames "$ifname"
 						config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
 					;;
@@ -59,19 +60,21 @@ add_vlan() {
 setup_interface() {
 	local iface="$1"
 	local config="$2"
-	local proto="$3"
+	local proto
 
 	[ -n "$config" ] || {
 		config=$(find_config "$iface")
 		[ "$?" = 0 ] || return 1
 	}
 
-	[ -n "$proto" ] || {
-		config_get proto "$config" proto
-	}
-
+	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"
 
@@ -143,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
+	}
+}