Merge tag 'upstream/1.2.3'

[quagga-debian.git] / ripngd / ripng_main.c

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 1c184e2c29cad3eca42e104cf6ccb64b78822840..39bc6145a73e681152aba6a540469949a8350ebd 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -192,7 +192,6 @@ main (int argc, char **argv)
   int vty_port = RIPNG_VTY_PORT;
   int daemon_mode = 0;
   char *progname;
   int vty_port = RIPNG_VTY_PORT;
   int daemon_mode = 0;
   char *progname;

-  struct thread thread;

   int dryrun = 0;
 
   /* Set umask before anything for security */
   int dryrun = 0;
 
   /* Set umask before anything for security */


@@ -308,8 +307,7 @@ main (int argc, char **argv)
   zlog_notice ("RIPNGd %s starting: vty@%d", QUAGGA_VERSION, vty_port);
 
   /* Fetch next active thread. */
   zlog_notice ("RIPNGd %s starting: vty@%d", QUAGGA_VERSION, vty_port);
 
   /* Fetch next active thread. */

-  while (thread_fetch (master, &thread))
-    thread_call (&thread);
+  thread_main (master);

 
   /* Not reached. */
   return 0;
 
   /* Not reached. */
   return 0;