zebra: 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/zebra/irdp_main.c b/zebra/irdp_main.c
index 43478c98f17d85cc5c0e108df6af7e5616d16d1a..65aad49a25c9bdea718dcb01eb96eb5228b2dbd8 100644 (file)
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -260,7 +260,7 @@ void irdp_advert_off(struct interface *ifp)
        if (!irdp)
                return;
 
-       thread_cancel(&irdp->t_advertise);
+       THREAD_OFF(irdp->t_advertise);
 
        if (ifp->connected)
                for (ALL_LIST_ELEMENTS(ifp->connected, node, nnode, ifc)) {
@@ -295,7 +295,7 @@ void process_solicit(struct interface *ifp)
                return;
 
        irdp->flags |= IF_SOLICIT;
-       thread_cancel(&irdp->t_advertise);
+       THREAD_OFF(irdp->t_advertise);
 
        timer = (frr_weak_random() % MAX_RESPONSE_DELAY) + 1;
 

diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c
index 31d8294a0fb07d6fc92259fc2bc00ded2b9a5faa..5c8aca96917274bcf068fc720b73ad10cf02a143 100644 (file)
--- a/zebra/kernel_netlink.c
+++ b/zebra/kernel_netlink.c
@@ -1902,7 +1902,7 @@ static void kernel_nlsock_fini(struct nlsock *nls)
 
 void kernel_terminate(struct zebra_ns *zns, bool complete)
 {
-       thread_cancel(&zns->t_netlink);
+       THREAD_OFF(zns->t_netlink);
 
        kernel_nlsock_fini(&zns->netlink);
 

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 424cea467309ec4b9561d37927280d9554b11040..a4330a3200cb93c7330039240c79d85750128327 100644 (file)
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -6043,8 +6043,8 @@ static void dplane_check_shutdown_status(struct thread *event)
                zns_info_list_del(&zdplane_info.dg_zns_list, zi);
 
                if (zdplane_info.dg_master) {
-                       thread_cancel(&zi->t_read);
-                       thread_cancel(&zi->t_request);
+                       THREAD_OFF(zi->t_read);
+                       THREAD_OFF(zi->t_request);
                }
 
                XFREE(MTYPE_DP_NS, zi);

diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 39b7156ce4f0c91c3a23eb45fa5bda2ecaea81da..21acaa823c6231908035600ab2d37894acbb8805 100644 (file)
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -496,7 +496,7 @@ static inline void zfpm_write_on(void)
  */
 static inline void zfpm_read_off(void)
 {
-       thread_cancel(&zfpm_g->t_read);
+       THREAD_OFF(zfpm_g->t_read);
 }
 
 /*
@@ -504,12 +504,12 @@ static inline void zfpm_read_off(void)
  */
 static inline void zfpm_write_off(void)
 {
-       thread_cancel(&zfpm_g->t_write);
+       THREAD_OFF(zfpm_g->t_write);
 }
 
 static inline void zfpm_connect_off(void)
 {
-       thread_cancel(&zfpm_g->t_connect);
+       THREAD_OFF(zfpm_g->t_connect);
 }
 
 /*
@@ -583,7 +583,7 @@ static void zfpm_connection_up(const char *detail)
        /*
         * Start thread to push existing routes to the FPM.
         */
-       thread_cancel(&zfpm_g->t_conn_up);
+       THREAD_OFF(zfpm_g->t_conn_up);
 
        zfpm_rnodes_iter_init(&zfpm_g->t_conn_up_state.iter);
        zfpm_g->fpm_mac_dump_done = false;
@@ -1687,7 +1687,7 @@ static void zfpm_stop_stats_timer(void)
                return;
 
        zfpm_debug("Stopping existing stats timer");
-       thread_cancel(&zfpm_g->t_stats);
+       THREAD_OFF(zfpm_g->t_stats);
 }
 
 /*

diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c
index b3cb0612425cb134d3793b4cd2acce2f7c4b2021..6ad54d5c505d8f27341a32385a61807a6a65c54c 100644 (file)
--- a/zebra/zebra_netns_notify.c
+++ b/zebra/zebra_netns_notify.c
@@ -413,7 +413,7 @@ void zebra_ns_notify_close(void)
                fd = zebra_netns_notify_current->u.fd;
 
        if (zebra_netns_notify_current->master != NULL)
-               thread_cancel(&zebra_netns_notify_current);
+               THREAD_OFF(zebra_netns_notify_current);
 
        /* auto-removal of notify items */
        if (fd > 0)

diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index 3127d2d3042619a3358aa034adf3a96768fa8d2d..4a18eb021e8edab9729316a20515138d37626ae1 100644 (file)
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -157,9 +157,9 @@ void zebra_ptm_finish(void)
                free(ptm_cb.in_data);
 
        /* Cancel events. */
-       thread_cancel(&ptm_cb.t_read);
-       thread_cancel(&ptm_cb.t_write);
-       thread_cancel(&ptm_cb.t_timer);
+       THREAD_OFF(ptm_cb.t_read);
+       THREAD_OFF(ptm_cb.t_write);
+       THREAD_OFF(ptm_cb.t_timer);
 
        if (ptm_cb.wb)
                buffer_free(ptm_cb.wb);
@@ -213,7 +213,7 @@ static int zebra_ptm_send_message(char *data, int size)
                                 ptm_cb.reconnect_time, &ptm_cb.t_timer);
                return -1;
        case BUFFER_EMPTY:
-               thread_cancel(&ptm_cb.t_write);
+               THREAD_OFF(ptm_cb.t_write);
                break;
        case BUFFER_PENDING:
                thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL,

diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c
index 7d1153f21f4dd64fcccb206a73a097136b0a5759..6dde513f4044cca8e25338c82ddbf6db6fcccfc6 100644 (file)
--- a/zebra/zebra_pw.c
+++ b/zebra/zebra_pw.c
@@ -102,7 +102,7 @@ void zebra_pw_del(struct zebra_vrf *zvrf, struct zebra_pw *pw)
                hook_call(pw_uninstall, pw);
                dplane_pw_uninstall(pw);
        } else if (pw->install_retry_timer)
-               thread_cancel(&pw->install_retry_timer);
+               THREAD_OFF(pw->install_retry_timer);
 
        /* unlink and release memory */
        RB_REMOVE(zebra_pw_head, &zvrf->pseudowires, pw);
@@ -219,7 +219,7 @@ void zebra_pw_install_failure(struct zebra_pw *pw, int pwstatus)
                        pw->vrf_id, pw->ifname, PW_INSTALL_RETRY_INTERVAL);
 
        /* schedule to retry later */
-       thread_cancel(&pw->install_retry_timer);
+       THREAD_OFF(pw->install_retry_timer);
        thread_add_timer(zrouter.master, zebra_pw_install_retry, pw,
                         PW_INSTALL_RETRY_INTERVAL, &pw->install_retry_timer);