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 /eigrpd | |
| 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 'eigrpd')
| -rw-r--r-- | eigrpd/eigrp_filter.c | 6 | ||||
| -rw-r--r-- | eigrpd/eigrp_interface.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c index 010fd2d3a..009b57e05 100644 --- a/eigrpd/eigrp_filter.c +++ b/eigrpd/eigrp_filter.c @@ -159,8 +159,8 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, #endif // TODO: check Graceful restart after 10sec - /* cancel GR scheduled */ - thread_cancel(&(e->t_distribute)); + /* cancel GR scheduled */ + thread_cancel(&(e->t_distribute)); /* schedule Graceful restart for whole process in 10sec */ thread_add_timer(master, eigrp_distribute_timer_process, e, @@ -264,7 +264,7 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, #endif // TODO: check Graceful restart after 10sec - /* Cancel GR scheduled */ + /* Cancel GR scheduled */ thread_cancel(&(ei->t_distribute)); /* schedule Graceful restart for interface in 10sec */ e->t_distribute = NULL; diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index e7c6b2e07..dd43dd047 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -420,7 +420,7 @@ void eigrp_if_free(struct eigrp_interface *ei, int source) struct eigrp *eigrp = ei->eigrp; if (source == INTERFACE_DOWN_BY_VTY) { - THREAD_OFF(ei->t_hello); + thread_cancel(&ei->t_hello); eigrp_hello_send(ei, EIGRP_HELLO_GRACEFUL_SHUTDOWN, NULL); } |