From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 11 Jun 2014 10:18:46 +0000 (+0200)
Subject: netifd: process reload calls immediately instead of going through a timer
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=5db02763d61785529bef538f196c180e968b7c26

netifd: process reload calls immediately instead of going through a timer

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

diff --git a/main.c b/main.c
index c5e8e67..bbae97b 100644
--- a/main.c
+++ b/main.c
@@ -211,22 +211,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);
 }