Merge pull request #11657 from donaldsharp/why_timer

convert thread_cancel to THREAD_OFF

1 files changed, 5 insertions, 5 deletions

diff --git a/isisd/isis_events.c b/isisd/isis_events.c
index fce48fec97..42823cf2b3 100644
--- a/isisd/isis_events.c
+++ b/isisd/isis_events.c
@@ -109,13 +109,13 @@ static void circuit_resign_level(struct isis_circuit *circuit, int level)
 			circuit->area->area_tag, circuit->circuit_id,
 			circuit->interface->name, level);
 
-	thread_cancel(&circuit->t_send_csnp[idx]);
-	thread_cancel(&circuit->t_send_psnp[idx]);
+	THREAD_OFF(circuit->t_send_csnp[idx]);
+	THREAD_OFF(circuit->t_send_psnp[idx]);
 
 	if (circuit->circ_type == CIRCUIT_T_BROADCAST) {
-		thread_cancel(&circuit->u.bc.t_send_lan_hello[idx]);
-		thread_cancel(&circuit->u.bc.t_run_dr[idx]);
-		thread_cancel(&circuit->u.bc.t_refresh_pseudo_lsp[idx]);
+		THREAD_OFF(circuit->u.bc.t_send_lan_hello[idx]);
+		THREAD_OFF(circuit->u.bc.t_run_dr[idx]);
+		THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[idx]);
 		circuit->lsp_regenerate_pending[idx] = 0;
 		circuit->u.bc.run_dr_elect[idx] = 0;
 		circuit->u.bc.is_dr[idx] = 0;