From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 26 Jun 2012 15:25:33 +0000 (+0000)
Subject: base-files: allow wireless ifaces to be part of multiple networks
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f2dde4f5ba51fed03823311f4638b5fc49bb2704;p=openwrt%2Fstaging%2Fkaloz.git

base-files: allow wireless ifaces to be part of multiple networks

SVN-Revision: 32503
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 2759e43a56..67e17111cf 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=110
+PKG_RELEASE:=111
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
index 8528efeed6..ef207878be 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -38,9 +38,12 @@ bridge_interface() {(
 	include /lib/network
 	scan_interfaces
 
-	config_get iftype "$cfg" type
-	[ "$iftype" = bridge ] && config_get "$cfg" ifname
-	prepare_interface_bridge "$cfg"
+	for cfg in $cfg; do
+		config_get iftype "$cfg" type
+		[ "$iftype" = bridge ] && config_get "$cfg" ifname
+		prepare_interface_bridge "$cfg"
+		return $?
+	done
 )}
 
 prepare_key_wep() {
@@ -132,7 +135,9 @@ start_net() {(
 	[ -z "$config" ] || {
 		include /lib/network
 		scan_interfaces
-		setup_interface "$iface" "$config" "" "$vifmac"
+		for config in $config; do
+			setup_interface "$iface" "$config" "" "$vifmac"
+		done
 	}
 )}