From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 18 Mar 2011 18:24:51 +0000 (+0000)
Subject: base-files: properly handle vlans on top of wireless interfaces
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fe8b9d5232b7a5cd2a5d14f5f00b9b4e0057bcfc;p=openwrt%2Fstaging%2Frmilecki.git

base-files: properly handle vlans on top of wireless interfaces

SVN-Revision: 26230
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5f8a3eaab42..a4a62d23f5d 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:=67
+PKG_RELEASE:=68
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index 4744a1e8100..013ece39ce9 100644
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -12,20 +12,23 @@ addif() {
 	# PPP devices are configured by pppd, no need to run setup_interface here
 	case "$INTERFACE" in
 		3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*) return 0;;
-		ath*) return 0;;
-		wlan*) return 0;;
 	esac
 
 	scan_interfaces
 	local cfg="$(find_config "$INTERFACE")"
 
-	# check the autoload setting
-	config_get auto "$cfg" auto
-	case "$auto" in
-		1|on|enabled) setup_interface "$INTERFACE";;
+	case "$INTERFACE" in
+		# Skip wireless parent interfaces
+		ath[0-9]|wlan[0-9]) ;;
+		*)
+			# check the autoload setting
+			config_get auto "$cfg" auto
+			case "$auto" in
+				1|on|enabled) setup_interface "$INTERFACE";;
+			esac
+		;;
 	esac
 
-
 	# find all vlan configurations for this interface and set them up as well
 	for ifc in $interfaces; do
 		config_get iftype "$ifc" type