Merge pull request #5706 from mjstapp/fix_nh_debug_show

[mirror_frr.git] / zebra / irdp_interface.c

diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index 5fdaae4fe5bf55052f501749d8f73acde8d69772..8e1ca122d391975cf471ed577f17e0e5b7249b3e 100644 (file)
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -45,7 +45,7 @@
 #include "zebra/interface.h"
 #include "zebra/rtadv.h"
 #include "zebra/rib.h"
-#include "zebra/zserv.h"
+#include "zebra/zebra_router.h"
 #include "zebra/redistribute.h"
 #include "zebra/irdp.h"
 #include "zebra/zebra_errors.h"
@@ -285,7 +285,7 @@ static void irdp_if_start(struct interface *ifp, int multicast,
                           timer);
 
        irdp->t_advertise = NULL;
-       thread_add_timer(zebrad.master, irdp_send_thread, ifp, timer,
+       thread_add_timer(zrouter.master, irdp_send_thread, ifp, timer,
                         &irdp->t_advertise);
 }
 
@@ -309,7 +309,7 @@ static void irdp_if_stop(struct interface *ifp)
 
        irdp_advert_off(ifp);
 
-       list_delete_and_null(&irdp->AdvPrefList);
+       list_delete(&irdp->AdvPrefList);
 
        irdp->flags = 0;
 }
@@ -352,7 +352,7 @@ static void irdp_if_no_shutdown(struct interface *ifp)
 
        irdp->flags &= ~IF_SHUTDOWN;
 
-       irdp_if_start(ifp, irdp->flags & IF_BROADCAST ? FALSE : TRUE, FALSE);
+       irdp_if_start(ifp, irdp->flags & IF_BROADCAST ? false : true, false);
 }
 
 
@@ -407,7 +407,7 @@ DEFUN (ip_irdp_multicast,
        VTY_DECLVAR_CONTEXT(interface, ifp);
        irdp_if_get(ifp);
 
-       irdp_if_start(ifp, TRUE, TRUE);
+       irdp_if_start(ifp, true, true);
        return CMD_SUCCESS;
 }
 
@@ -421,7 +421,7 @@ DEFUN (ip_irdp_broadcast,
        VTY_DECLVAR_CONTEXT(interface, ifp);
        irdp_if_get(ifp);
 
-       irdp_if_start(ifp, FALSE, TRUE);
+       irdp_if_start(ifp, false, true);
        return CMD_SUCCESS;
 }
 
@@ -706,7 +706,7 @@ DEFUN (ip_irdp_debug_disable,
        return CMD_SUCCESS;
 }
 
-void irdp_if_init()
+void irdp_if_init(void)
 {
        hook_register(zebra_if_config_wr, irdp_config_write);
        hook_register(if_del, irdp_if_delete);