diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-13 12:25:28 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-13 12:25:28 +0000 |
| commit | a0ced97706dbca0796e544a2e595a68872e2b1c7 (patch) | |
| tree | 2cbd8d174dd705ba0ee741141907d26503d68670 /package/base-files-network/files/lib/network/config.sh | |
| parent | 5ce4a896b78d06974666a829247d0d15c0997ef8 (diff) | |
[package] base-files-network: configure vlan interface name type immediately before the vconfig add calls, fixes race condition (#11127)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30919 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files-network/files/lib/network/config.sh')
| -rwxr-xr-x | package/base-files-network/files/lib/network/config.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |