Merge tag 'upstream/1.2.3'

[quagga-debian.git] / zebra / main.c

diff --git a/zebra/main.c b/zebra/main.c
index 35cb1593ebab10a0ff2c6f98b1ad7aeb51ad2ca5..e34ff76e2a1eb624166f54bc5ecbb8e0e48a9e9a 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -295,7 +295,6 @@ main (int argc, char **argv)
   int daemon_mode = 0;
   char *config_file = NULL;
   char *progname;
-  struct thread thread;
   char *zserv_path = NULL;
   char *fpm_format = NULL;
 
@@ -489,10 +488,8 @@ main (int argc, char **argv)
 
   /* Print banner. */
   zlog_notice ("Zebra %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+  
+  thread_main (zebrad.master);
 
-  while (thread_fetch (zebrad.master, &thread))
-    thread_call (&thread);
-
-  /* Not reached... */
   return 0;
 }