summaryrefslogtreecommitdiff
path: root/ldpd/adjacency.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2022-07-21 08:26:43 -0400
committerDonald Sharp <sharpd@nvidia.com>2022-07-21 08:30:50 -0400
commit2783a6921c8fd3917caa539df82e0d9f2a23eb0c (patch)
treed66407b5a832fe546455929c48511154d7a98edc /ldpd/adjacency.c
parentfa935aa7e8d46e4e5ff717f68523261903bb68b7 (diff)
ldpd: Convert thread_cancel to THREAD_OFF
Just convert all uses of thread_cancel to THREAD_OFF Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ldpd/adjacency.c')
-rw-r--r--ldpd/adjacency.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c
index 04a24242dc..8caa3c4e24 100644
--- a/ldpd/adjacency.c
+++ b/ldpd/adjacency.c
@@ -196,7 +196,7 @@ static void adj_itimer(struct thread *thread)
void
adj_start_itimer(struct adj *adj)
{
- thread_cancel(&adj->inactivity_timer);
+ THREAD_OFF(adj->inactivity_timer);
adj->inactivity_timer = NULL;
thread_add_timer(master, adj_itimer, adj, adj->holdtime,
&adj->inactivity_timer);
@@ -205,7 +205,7 @@ adj_start_itimer(struct adj *adj)
void
adj_stop_itimer(struct adj *adj)
{
- thread_cancel(&adj->inactivity_timer);
+ THREAD_OFF(adj->inactivity_timer);
}
/* targeted neighbors */
@@ -354,7 +354,7 @@ static void tnbr_hello_timer(struct thread *thread)
static void
tnbr_start_hello_timer(struct tnbr *tnbr)
{
- thread_cancel(&tnbr->hello_timer);
+ THREAD_OFF(tnbr->hello_timer);
tnbr->hello_timer = NULL;
thread_add_timer(master, tnbr_hello_timer, tnbr, tnbr_get_hello_interval(tnbr),
&tnbr->hello_timer);
@@ -363,7 +363,7 @@ tnbr_start_hello_timer(struct tnbr *tnbr)
static void
tnbr_stop_hello_timer(struct tnbr *tnbr)
{
- thread_cancel(&tnbr->hello_timer);
+ THREAD_OFF(tnbr->hello_timer);
}
struct ctl_adj *