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

SVN-Revision: 26230
This commit is contained in:
Jo-Philipp Wich 2011-03-18 18:24:51 +00:00
parent a8d84ae94d
commit fe8b9d5232
2 changed files with 11 additions and 8 deletions

View File

@ -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

View File

@ -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