From 684272ac31a444beba1a0e730001c9b799838d22 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 18 Mar 2011 18:24:51 +0000
Subject: [package] base-files: properly handle vlans on top of wireless
 interfaces

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26230 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/etc/hotplug.d/net/10-net | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'package/base-files/files/etc/hotplug.d/net')

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 4744a1e810..013ece39ce 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
-- 
cgit v1.2.3