From 146bcb9b923b46096cd765577aafc1251cc86b69 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 3 Jun 2022 12:47:04 -0400 Subject: zebra: Convert thread_cancel to THREAD_OFF Just convert all uses of thread_cancel to THREAD_OFF Signed-off-by: Donald Sharp --- zebra/zebra_pw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zebra/zebra_pw.c') diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index 7d1153f21f..6dde513f40 100644 --- 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); -- cgit v1.2.3