bridge: add support for configuring extra vlans for the bridge itself

[project/netifd.git] / interface-event.c

diff --git a/interface-event.c b/interface-event.c
index d370caec4c9b9d3b821c6f0fab9bc5ac45989abd..b03bfbcac7f055b5cc8e9a3d5898fed7522ae51f 100644 (file)
--- a/interface-event.c
+++ b/interface-event.c
@@ -33,10 +33,12 @@ static struct uloop_process task = {
 static const char * const eventnames[] = {
        [IFEV_DOWN] = "ifdown",
        [IFEV_UP] = "ifup",
+       [IFEV_UP_FAILED] = "ifup-failed",
        [IFEV_UPDATE] = "ifupdate",
        [IFEV_FREE] = "free",
        [IFEV_RELOAD] = "reload",
        [IFEV_LINK_UP] = "iflink",
+       [IFEV_CREATE] = "create",
 };
 
 static void
@@ -47,8 +49,10 @@ run_cmd(const char *ifname, const char *device, enum interface_event event,
        int pid;
 
        pid = fork();
-       if (pid < 0)
-               return task_complete(NULL, -1);
+       if (pid < 0) {
+               task_complete(NULL, -1);
+               return;
+       }
 
        if (pid > 0) {
                task.pid = pid;
@@ -124,6 +128,10 @@ interface_queue_event(struct interface *iface, enum interface_event ev)
 
        netifd_ubus_interface_notify(iface, ev != IFEV_DOWN);
 
+       /* no hotplug.d calls for link up */
+       if (ev == IFEV_LINK_UP)
+               return;
+
        if (current == iface) {
                /* an event for iface is being processed */
                if (!list_empty(&iface->hotplug_list)) {
@@ -187,14 +195,16 @@ static void interface_event_cb(struct interface_user *dep, struct interface *ifa
        switch (ev) {
                case IFEV_LINK_UP:
                case IFEV_UP:
+               case IFEV_UP_FAILED:
                case IFEV_UPDATE:
                case IFEV_DOWN:
                        interface_queue_event(iface, ev);
                        break;
                case IFEV_FREE:
-               case IFEV_RELOAD:
                        interface_dequeue_event(iface);
                        break;
+               default:
+                       break;
        }
 }