diff options
| author | David Lamparter <equinox@diac24.net> | 2019-02-05 00:54:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 00:54:16 +0100 |
| commit | 83c2a84d7cfe9b4132f15b04593869cee5f408e9 (patch) | |
| tree | 5f39f3561b35222fe36ce61aae78a29a2cac74c0 /zebra/irdp_main.c | |
| parent | 5a753fee025b0cf5fcc0050ba41e5ec8cf948972 (diff) | |
| parent | b120fe3b69208980372d04728ee57894b6a7a842 (diff) | |
Merge pull request #3602 from donaldsharp/mlag_debug
zebra cleanup and some mlag additions
Diffstat (limited to 'zebra/irdp_main.c')
| -rw-r--r-- | zebra/irdp_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index 9300ba6034..a9734056bc 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -56,7 +56,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" @@ -113,7 +113,7 @@ int irdp_sock_init(void) }; t_irdp_raw = NULL; - thread_add_read(zebrad.master, irdp_read_raw, NULL, sock, &t_irdp_raw); + thread_add_read(zrouter.master, irdp_read_raw, NULL, sock, &t_irdp_raw); return sock; } @@ -245,7 +245,7 @@ int irdp_send_thread(struct thread *t_advert) 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); return 0; } @@ -306,7 +306,7 @@ void process_solicit(struct interface *ifp) timer = (random() % MAX_RESPONSE_DELAY) + 1; 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); } |