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>

diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 9d73c3dfe63ba8921c2d3d74e0b29b55da25e84f..b8567830b1d6edc04570a2457b8e2cb9a5d49cbb 100644 (file)
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -318,12 +318,12 @@ void ospf_apiserver_free(struct ospf_apiserver *apiserv)
        struct listnode *node;
 
        /* Cancel read and write threads. */
-       thread_cancel(&apiserv->t_sync_read);
+       THREAD_OFF(apiserv->t_sync_read);
 #ifdef USE_ASYNC_READ
-       thread_cancel(&apiserv->t_async_read);
+       THREAD_OFF(apiserv->t_async_read);
 #endif /* USE_ASYNC_READ */
-       thread_cancel(&apiserv->t_sync_write);
-       thread_cancel(&apiserv->t_async_write);
+       THREAD_OFF(apiserv->t_sync_write);
+       THREAD_OFF(apiserv->t_async_write);
 
        /* Unregister all opaque types that application registered
           and flush opaque LSAs if still in LSDB. */

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index d2ade9f113f5ad32cc410ffc5f713cef9c87c2d5..4b3f30a3f19d0212de65d7c706db1786a9670b98 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -466,7 +466,7 @@ static void ospf_ls_req_timer(struct thread *thread)
 
 void ospf_ls_req_event(struct ospf_neighbor *nbr)
 {
-       thread_cancel(&nbr->t_ls_req);
+       THREAD_OFF(nbr->t_ls_req);
        thread_add_event(master, ospf_ls_req_timer, nbr, 0, &nbr->t_ls_req);
 }
 

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index d10c03e586b23279e9e405adc77474cfc1ae32f1..8512b6a3399cdc611a168d351407d0e9401b4484 100644 (file)
--- 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;
        }