use lock to remove race conditions in bringing up ppp and dhcp that would lead to...

[openwrt.git] / package / base-files / default / etc / hotplug.d / net / 10-net

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index d5b7f6b..4e5c304 100644 (file)
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,18 +1,15 @@
 # Copyright (C) 2006 OpenWrt.org
 
 # Copyright (C) 2006 OpenWrt.org
 

-include network
+include /lib/network

 
 addif() {
        scan_interfaces
        setup_interface "$INTERFACE"
 
 addif() {
        scan_interfaces
        setup_interface "$INTERFACE"

-       
+

        # find all vlan configurations for this interface and set them up as well
        for ifc in $interfaces; do
        # find all vlan configurations for this interface and set them up as well
        for ifc in $interfaces; do

-               config_get type "$ifc" type
-               case "$type" in
-                       bridge) config_get ifs "$ifc" ifnames;;
-                       *) config_get ifs "$ifc" ifname;;
-               esac
+               config_get iftype "$ifc" type
+               config_get ifs "$ifc" device

                for dev in $ifs; do
                        [ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
                                add_vlan "$dev"
                for dev in $ifs; do
                        [ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
                                add_vlan "$dev"


@@ -23,6 +20,9 @@ addif() {
 
 case "$ACTION" in
        add|register)
 
 case "$ACTION" in
        add|register)

+               case "$PHYSDEVDRIVER" in
+                       natsemi) sleep 1;;
+               esac

                addif
        ;;
 esac
                addif
        ;;
 esac