aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-03-18 18:24:51 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-03-18 18:24:51 +0000
commit684272ac31a444beba1a0e730001c9b799838d22 (patch)
tree34cd5684d2c7f9009408b193a07d265615fc697a /package
parentde1c12f7a181a27b8463f60fd88cb30f858ab517 (diff)
downloadupstream-684272ac31a444beba1a0e730001c9b799838d22.tar.gz
upstream-684272ac31a444beba1a0e730001c9b799838d22.tar.bz2
upstream-684272ac31a444beba1a0e730001c9b799838d22.zip
[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
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/files/etc/hotplug.d/net/10-net17
2 files changed, 11 insertions, 8 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 5f8a3eaab4..a4a62d23f5 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 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