bridge: rework config change pvid handling

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

diff --git a/interface-event.c b/interface-event.c
index a40f6dc883d3a3654d73d0592cd7eb65c2a8de85..892d744ba270cd0cd627ab00753a692df538bd5c 100644 (file)
--- a/interface-event.c
+++ b/interface-event.c
@@ -49,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;
@@ -95,7 +97,7 @@ call_hotplug(void)
        if ((current_ev == IFEV_UP || current_ev == IFEV_UPDATE) && current->l3_dev.dev)
                device = current->l3_dev.dev->ifname;
 
-       D(SYSTEM, "Call hotplug handler for interface '%s', event '%s' (%s)\n",
+       D(SYSTEM, "Call hotplug handler for interface '%s', event '%s' (%s)",
        current->name, eventnames[current_ev], device ? device : "none");
        run_cmd(current->name, device, current_ev, current->updated);
 }
@@ -104,7 +106,7 @@ static void
 task_complete(struct uloop_process *proc, int ret)
 {
        if (current)
-               D(SYSTEM, "Complete hotplug handler for interface '%s'\n", current->name);
+               D(SYSTEM, "Complete hotplug handler for interface '%s'", current->name);
        current = NULL;
        call_hotplug();
 }
@@ -119,7 +121,7 @@ task_complete(struct uloop_process *proc, int ret)
 static void
 interface_queue_event(struct interface *iface, enum interface_event ev)
 {
-       D(SYSTEM, "Queue hotplug handler for interface '%s', event '%s'\n",
+       D(SYSTEM, "Queue hotplug handler for interface '%s', event '%s'",
                        iface->name, eventnames[ev]);
        if (ev == IFEV_UP || ev == IFEV_DOWN)
                netifd_ubus_interface_event(iface, ev == IFEV_UP);