diff options
author | Mark Stapp <mjs@voltanet.io> | 2020-07-17 23:09:51 +0200 |
---|---|---|
committer | Mark Stapp <mjs@voltanet.io> | 2020-10-23 18:16:52 +0200 |
commit | 5047884528ec263215504cb5df12ebd2422cc392 (patch) | |
tree | 952121f1a904ef9c86c1f7336a3aae757eeb3434 /ospfd/ospf_sr.c | |
parent | * : update signature of thread_cancel api (diff) | |
download | frr-5047884528ec263215504cb5df12ebd2422cc392.tar.xz frr-5047884528ec263215504cb5df12ebd2422cc392.zip |
*: 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 'ospfd/ospf_sr.c')
-rw-r--r-- | ospfd/ospf_sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index 4e32732c8..b0b273fb2 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -519,7 +519,7 @@ static void ospf_sr_stop(void) osr_debug("SR (%s): Stop Segment Routing", __func__); /* Disable any re-attempt to connect to Label Manager */ - THREAD_TIMER_OFF(OspfSR.t_start_lm); + THREAD_OFF(OspfSR.t_start_lm); /* Release SRGB & SRLB if active. */ if (OspfSR.srgb.reserved) |