diff --git a/package/base-files/Makefile b/package/base-files/Makefile index d58e17df6..af14cb44b 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2010 OpenWrt.org +# Copyright (C) 2007-2011 OpenWrt.org # Copyright (C) 2010 Vertical Communications # # This is free software, licensed under the GNU General Public License v2. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files -PKG_RELEASE:=43.14 +PKG_RELEASE:=43.15 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 0886c74c5..c006b9c25 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 ppp*|3g-*) 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