X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=main.c;h=5717b8197e4bbbacc546e4e919e8db1b30aebe3c;hp=c5e8e67b2f66dfa5e3e16d31e34a0c33a42e6c88;hb=c007f08413edc15805c248a8d65f075bb5fb0bdd;hpb=9cf7219d554f73c014b9c6efde7965384d8346ec

diff --git a/main.c b/main.c
index c5e8e67..5717b81 100644
--- a/main.c
+++ b/main.c
@@ -173,9 +173,6 @@ netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
 		exit(127);
 	}
 
-	if (pid < 0)
-		goto error;
-
 	close(pfds[1]);
 	proc->uloop.cb = netifd_process_cb;
 	proc->uloop.pid = pid;
@@ -211,22 +208,17 @@ static void netifd_do_restart(struct uloop_timeout *timeout)
 	execvp(global_argv[0], global_argv);
 }
 
-static void netifd_do_reload(struct uloop_timeout *timeout)
-{
-	config_init_all();
-}
-
-static struct uloop_timeout main_timer;
-
 void netifd_reload(void)
 {
-	main_timer.cb = netifd_do_reload;
-	uloop_timeout_set(&main_timer, 100);
+	config_init_all();
 }
 
 void netifd_restart(void)
 {
-	main_timer.cb = netifd_do_restart;
+	static struct uloop_timeout main_timer = {
+		.cb = netifd_do_restart
+	};
+
 	interface_set_down(NULL);
 	uloop_timeout_set(&main_timer, 1000);
 }