From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 8 Nov 2011 14:43:55 +0000 (+0000)
Subject: base-files: merge r28860
X-Git-Tag: backfire_10.03.1~75
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=44e8cd27f9c65da6f6a6de29efa9cf6d8db404aa;p=openwrt%2Fsvn-archive%2Fopenwrt.git

base-files: merge r28860

SVN-Revision: 28861
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f38792887a..63bae5753f 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=43.29
+PKG_RELEASE:=43.30
 
 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 e21ea6ba9e..8545bfeded 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -120,9 +120,11 @@ start_net() {(
 	local vifmac="$3"
 
 	[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
-	include /lib/network
-	scan_interfaces
-	setup_interface "$iface" "$config" "" "$vifmac"
+	[ -z "$config" ] || {
+		include /lib/network
+		scan_interfaces
+		setup_interface "$iface" "$config" "" "$vifmac"
+	}
 )}
 
 set_wifi_up() {