diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-07-22 08:26:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 08:26:08 +0300 |
| commit | eed5b70f94b51c05bdbcebf39ade792213fd124b (patch) | |
| tree | 82932e6c0215ec11400b2b9e7efd911d7880d285 /isisd/isis_circuit.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'isisd/isis_circuit.c')
| -rw-r--r-- | isisd/isis_circuit.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 28d4b530fc..9e97e48937 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -845,12 +845,12 @@ void isis_circuit_down(struct isis_circuit *circuit) memset(circuit->u.bc.l2_desig_is, 0, ISIS_SYS_ID_LEN + 1); memset(circuit->u.bc.snpa, 0, ETH_ALEN); - thread_cancel(&circuit->u.bc.t_send_lan_hello[0]); - thread_cancel(&circuit->u.bc.t_send_lan_hello[1]); - thread_cancel(&circuit->u.bc.t_run_dr[0]); - thread_cancel(&circuit->u.bc.t_run_dr[1]); - thread_cancel(&circuit->u.bc.t_refresh_pseudo_lsp[0]); - thread_cancel(&circuit->u.bc.t_refresh_pseudo_lsp[1]); + THREAD_OFF(circuit->u.bc.t_send_lan_hello[0]); + THREAD_OFF(circuit->u.bc.t_send_lan_hello[1]); + THREAD_OFF(circuit->u.bc.t_run_dr[0]); + THREAD_OFF(circuit->u.bc.t_run_dr[1]); + THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[0]); + THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[1]); circuit->lsp_regenerate_pending[0] = 0; circuit->lsp_regenerate_pending[1] = 0; @@ -860,7 +860,7 @@ void isis_circuit_down(struct isis_circuit *circuit) } else if (circuit->circ_type == CIRCUIT_T_P2P) { isis_delete_adj(circuit->u.p2p.neighbor); circuit->u.p2p.neighbor = NULL; - thread_cancel(&circuit->u.p2p.t_send_p2p_hello); + THREAD_OFF(circuit->u.p2p.t_send_p2p_hello); } /* @@ -873,11 +873,11 @@ void isis_circuit_down(struct isis_circuit *circuit) circuit->snmp_adj_idx_gen = 0; /* Cancel all active threads */ - thread_cancel(&circuit->t_send_csnp[0]); - thread_cancel(&circuit->t_send_csnp[1]); - thread_cancel(&circuit->t_send_psnp[0]); - thread_cancel(&circuit->t_send_psnp[1]); - thread_cancel(&circuit->t_read); + THREAD_OFF(circuit->t_send_csnp[0]); + THREAD_OFF(circuit->t_send_csnp[1]); + THREAD_OFF(circuit->t_send_psnp[0]); + THREAD_OFF(circuit->t_send_psnp[1]); + THREAD_OFF(circuit->t_read); if (circuit->tx_queue) { isis_tx_queue_free(circuit->tx_queue); |