Merge tag 'upstream/1.2.3'

[quagga-debian.git] / nhrpd / nhrp_main.c

diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c
index 56ea2713afc20cbb678bc0fd43e428727d44a619..1e3fee583a7bc8f852baad1f988f586b8ef98450 100644 (file)
--- a/nhrpd/nhrp_main.c
+++ b/nhrpd/nhrp_main.c
@@ -184,7 +184,6 @@ static struct quagga_signal_t sighandlers[] = {
 
 int main(int argc, char **argv)
 {
-       struct thread thread;
        const char *progname;
 
        /* Set umask before anything for security */
@@ -240,8 +239,7 @@ int main(int argc, char **argv)
        zlog_notice("nhrpd starting: vty@%d", vty_port);
 
        /* Main loop */
-       while (thread_fetch(master, &thread))
-               thread_call(&thread);
+       thread_main (master);
 
        return 0;
 }