diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-03-13 12:25:28 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-03-13 12:25:28 +0000 |
| commit | 95edc71814e0e94ecf347f86f1cb5c87c90be676 (patch) | |
| tree | b4776eb2612c8e78d278e9cedacdd74938bc7773 /package | |
| parent | dce6ee5830d79c038011ade15b970448a8215a3c (diff) | |
| download | upstream-95edc71814e0e94ecf347f86f1cb5c87c90be676.tar.gz upstream-95edc71814e0e94ecf347f86f1cb5c87c90be676.tar.bz2 upstream-95edc71814e0e94ecf347f86f1cb5c87c90be676.zip | |
base-files-network: configure vlan interface name type immediately before the vconfig add calls, fixes race condition (#11127)
SVN-Revision: 30919
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files-network/Makefile | 4 | ||||
| -rwxr-xr-x | package/base-files-network/files/lib/network/config.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/package/base-files-network/Makefile b/package/base-files-network/Makefile index 65ed020ac9..80e78154f5 100644 --- a/package/base-files-network/Makefile +++ b/package/base-files-network/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files-network -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_BUILD_DEPENDS:=opkg/host diff --git a/package/base-files-network/files/lib/network/config.sh b/package/base-files-network/files/lib/network/config.sh index feeaa2f9ce..a58ab1edcf 100755 --- a/package/base-files-network/files/lib/network/config.sh +++ b/package/base-files-network/files/lib/network/config.sh @@ -83,6 +83,7 @@ add_vlan() { [ "$1" = "$vif" ] || ifconfig "$1" >/dev/null 2>/dev/null || { ifconfig "$vif" up 2>/dev/null >/dev/null || add_vlan "$vif" + $DEBUG vconfig set_name_type DEV_PLUS_VID_NO_PAD $DEBUG vconfig add "$vif" "${1##*\.}" return 0 } @@ -218,7 +219,8 @@ prepare_interface() { $DEBUG brctl addif "br-$config" "$iface" $DEBUG brctl stp "br-$config" $stp [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)" - echo $igmp_snooping > /sys/devices/virtual/net/br-$config/bridge/multicast_snooping 2>/dev/null + [ -e /sys/devices/virtual/net/br-$config/bridge/multicast_snooping ] && \ + echo $igmp_snooping > /sys/devices/virtual/net/br-$config/bridge/multicast_snooping $DEBUG ifconfig "br-$config" hw ether $macaddr up # Creating the bridge here will have triggered a hotplug event, which will # result in another setup_interface() call, so we simply stop processing |