From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 29 Oct 2012 23:50:47 +0000 (+0100)
Subject: proto-shell: ensure that the teardown timeout gets killed
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=5eb4f53ce6f1502e16114b51e50ab85ecbc8eb99;ds=inline

proto-shell: ensure that the teardown timeout gets killed

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/proto-shell.c b/proto-shell.c
index 2a5eda0..038fb0b 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -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);