apply device settings to simple devices with config specified from the interface...

[project/netifd.git] / proto-shell.c

diff --git a/proto-shell.c b/proto-shell.c
index c0af99f..415eb74 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -125,10 +125,6 @@ proto_shell_teardown_cb(struct netifd_process *p, int ret)
                return;
 
        netifd_kill_process(&state->proto_task);
-
-       if (state->l3_dev.dev)
-               device_remove_user(&state->l3_dev);
-
        state->proto.proto_event(&state->proto, IFPEV_DOWN);
 }
 
@@ -322,11 +318,14 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
        if (!tb[NOTIFY_IFNAME]) {
                if (!state->proto.iface->main_dev.dev)
                        return UBUS_STATUS_INVALID_ARGUMENT;
-       } else if (!state->l3_dev.dev) {
+       } else {
+               if (state->l3_dev.dev)
+                       device_remove_user(&state->l3_dev);
+
                device_add_user(&state->l3_dev,
                        device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
-               device_claim(&state->l3_dev);
                state->proto.iface->l3_dev = &state->l3_dev;
+               device_claim(&state->l3_dev);
        }
 
        interface_ip_update_start(state->proto.iface);
@@ -470,10 +469,13 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
        state->setup_timeout.cb = proto_shell_setup_timeout_cb;
        state->setup_task.cb = proto_shell_setup_cb;
        state->setup_task.dir_fd = proto_fd.fd;
+       state->setup_task.log_prefix = iface->name;
        state->teardown_task.cb = proto_shell_teardown_cb;
        state->teardown_task.dir_fd = proto_fd.fd;
+       state->teardown_task.log_prefix = iface->name;
        state->proto_task.cb = proto_shell_task_cb;
        state->proto_task.dir_fd = proto_fd.fd;
+       state->proto_task.log_prefix = iface->name;
        state->handler = container_of(h, struct proto_shell_handler, proto);
 
        return &state->proto;