summaryrefslogtreecommitdiff
path: root/isisd/isis_sr.c
diff options
context:
space:
mode:
authorMark Stapp <mjs@voltanet.io>2020-07-17 17:09:51 -0400
committerMark Stapp <mjs@voltanet.io>2020-10-23 12:16:52 -0400
commit5047884528ec263215504cb5df12ebd2422cc392 (patch)
tree952121f1a904ef9c86c1f7336a3aae757eeb3434 /isisd/isis_sr.c
parentb3d6bc6ef0140a194b4bc2993a6aba72ab5d54c9 (diff)
*: unify thread/event cancel macros
Replace all lib/thread cancel macros, use thread_cancel() everywhere. Only the THREAD_OFF macro and thread_cancel() api are supported. Also adjust thread_cancel_async() to NULL caller's pointer (if present). Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'isisd/isis_sr.c')
-rw-r--r--isisd/isis_sr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/isisd/isis_sr.c b/isisd/isis_sr.c
index 842103de1e..3f62f4dcac 100644
--- a/isisd/isis_sr.c
+++ b/isisd/isis_sr.c
@@ -2284,7 +2284,7 @@ void isis_sr_stop(struct isis_area *area)
area->area_tag);
/* Disable any re-attempt to connect to Label Manager */
- THREAD_TIMER_OFF(srdb->t_start_lm);
+ thread_cancel(&srdb->t_start_lm);
/* Uninstall all local Adjacency-SIDs. */
for (ALL_LIST_ELEMENTS(area->srdb.adj_sids, node, nnode, sra))