proto-shell: ensure that the teardown timeout gets killed
authorFelix Fietkau <nbd@openwrt.org>
Mon, 29 Oct 2012 23:50:47 +0000 (00:50 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 30 Oct 2012 00:22:03 +0000 (01:22 +0100)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
proto-shell.c

index 2a5eda0144d37f3a2327af015ab4d595265b4d66..038fb0b8ff7e980babed5934386a114de6277f19 100644 (file)
@@ -317,6 +317,7 @@ proto_shell_free(struct interface_proto_state *proto)
        struct proto_shell_state *state;
 
        state = container_of(proto, struct proto_shell_state, proto);
+       uloop_timeout_cancel(&state->teardown_timeout);
        proto_shell_clear_host_dep(state);
        netifd_kill_process(&state->script_task);
        netifd_kill_process(&state->proto_task);