diff options
Diffstat (limited to 'ldpd/adjacency.c')
| -rw-r--r-- | ldpd/adjacency.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c index 794bc66ce9..0108af8044 100644 --- a/ldpd/adjacency.c +++ b/ldpd/adjacency.c @@ -163,7 +163,7 @@ adj_get_af(const struct adj *adj) /* ARGSUSED */ static void adj_itimer(struct event *thread) { - struct adj *adj = THREAD_ARG(thread); + struct adj *adj = EVENT_ARG(thread); adj->inactivity_timer = NULL; @@ -185,7 +185,7 @@ static void adj_itimer(struct event *thread) void adj_start_itimer(struct adj *adj) { - THREAD_OFF(adj->inactivity_timer); + EVENT_OFF(adj->inactivity_timer); adj->inactivity_timer = NULL; event_add_timer(master, adj_itimer, adj, adj->holdtime, &adj->inactivity_timer); @@ -194,7 +194,7 @@ adj_start_itimer(struct adj *adj) void adj_stop_itimer(struct adj *adj) { - THREAD_OFF(adj->inactivity_timer); + EVENT_OFF(adj->inactivity_timer); } /* targeted neighbors */ @@ -333,7 +333,7 @@ tnbr_get_hello_interval(struct tnbr *tnbr) /* ARGSUSED */ static void tnbr_hello_timer(struct event *thread) { - struct tnbr *tnbr = THREAD_ARG(thread); + struct tnbr *tnbr = EVENT_ARG(thread); tnbr->hello_timer = NULL; send_hello(HELLO_TARGETED, NULL, tnbr); @@ -343,7 +343,7 @@ static void tnbr_hello_timer(struct event *thread) static void tnbr_start_hello_timer(struct tnbr *tnbr) { - THREAD_OFF(tnbr->hello_timer); + EVENT_OFF(tnbr->hello_timer); tnbr->hello_timer = NULL; event_add_timer(master, tnbr_hello_timer, tnbr, tnbr_get_hello_interval(tnbr), &tnbr->hello_timer); @@ -352,7 +352,7 @@ tnbr_start_hello_timer(struct tnbr *tnbr) static void tnbr_stop_hello_timer(struct tnbr *tnbr) { - THREAD_OFF(tnbr->hello_timer); + EVENT_OFF(tnbr->hello_timer); } struct ctl_adj * |