From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 8 Nov 2011 14:42:58 +0000 (+0000)
Subject: base-files: properly handle wifi ifaces with no network attached, useful for unmanage... 
X-Git-Tag: reboot~15608
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a73fffe85735f0417902ad3f43abc15348005713;p=oweals%2Fopenwrt.git

base-files: properly handle wifi ifaces with no network attached, useful for unmanaged interfaces like used for batman or monitoring

SVN-Revision: 28860
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c3b0350889..2b1cfa13b3 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:=88
+PKG_RELEASE:=89
 
 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 2e66bfcbe8..5cbf50b5f5 100755
--- a/package/base-files/files/sbin/wifi
+++ b/package/base-files/files/sbin/wifi
@@ -129,9 +129,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() {