Merge tag 'upstream/1.2.3'

[quagga-debian.git] / bgpd / bgp_main.c

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index af9c03052020db2065ff22d9c27c554915292ca2..e5a4c60f20b64f6068fb5f2b06b79eb7c56d376e 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -346,7 +346,6 @@ main (int argc, char **argv)
   int daemon_mode = 0;
   int dryrun = 0;
   char *progname;
-  struct thread thread;
   int tmp_port;
   int skip_runas = 0;
 
@@ -485,8 +484,7 @@ main (int argc, char **argv)
               getpid ());
 
   /* Start finite state machine, here we go! */
-  while (thread_fetch (bm->master, &thread))
-    thread_call (&thread);
+  thread_main (bm->master);
 
   /* Not reached. */
   return (0);