diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-06-03 16:31:04 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2022-07-21 14:27:35 +0200 |
| commit | bc1f09de739fa80b3a6ea37cfc9fcdd3dfd8abb8 (patch) | |
| tree | bfd2f0fc4bc252738ee77532d84f99c2c9ce6ca3 /ospfd/ospfd.c | |
| parent | ospfd: Remove various macros that overlap THREAD_OFF (diff) | |
| download | frr-bc1f09de739fa80b3a6ea37cfc9fcdd3dfd8abb8.tar.xz frr-bc1f09de739fa80b3a6ea37cfc9fcdd3dfd8abb8.zip | |
ospfd: 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 'ospfd/ospfd.c')
| -rw-r--r-- | ospfd/ospfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index d10c03e58..8512b6a33 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -1428,7 +1428,7 @@ void ospf_ls_upd_queue_empty(struct ospf_interface *oi) } /* remove update event */ - thread_cancel(&oi->t_ls_upd_event); + THREAD_OFF(oi->t_ls_upd_event); } void ospf_if_update(struct ospf *ospf, struct interface *ifp) @@ -2263,7 +2263,7 @@ static int ospf_vrf_disable(struct vrf *vrf) if (IS_DEBUG_OSPF_EVENT) zlog_debug("%s: ospf old_vrf_id %d unlinked", __func__, old_vrf_id); - thread_cancel(&ospf->t_read); + THREAD_OFF(ospf->t_read); close(ospf->fd); ospf->fd = -1; } |