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_dr.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_dr.c')
| -rw-r--r-- | isisd/isis_dr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/isisd/isis_dr.c b/isisd/isis_dr.c index 27b7388072..b9bf49867d 100644 --- a/isisd/isis_dr.c +++ b/isisd/isis_dr.c @@ -222,8 +222,8 @@ int isis_dr_resign(struct isis_circuit *circuit, int level) circuit->u.bc.is_dr[level - 1] = 0; circuit->u.bc.run_dr_elect[level - 1] = 0; - thread_cancel(&circuit->u.bc.t_run_dr[level - 1]); - thread_cancel(&circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); + THREAD_OFF(circuit->u.bc.t_run_dr[level - 1]); + THREAD_OFF(circuit->u.bc.t_refresh_pseudo_lsp[level - 1]); circuit->lsp_regenerate_pending[level - 1] = 0; memcpy(id, circuit->isis->sysid, ISIS_SYS_ID_LEN); @@ -247,7 +247,7 @@ int isis_dr_resign(struct isis_circuit *circuit, int level) &circuit->t_send_psnp[1]); } - thread_cancel(&circuit->t_send_csnp[level - 1]); + THREAD_OFF(circuit->t_send_csnp[level - 1]); thread_add_timer(master, isis_run_dr, &circuit->level_arg[level - 1], @@ -285,8 +285,6 @@ int isis_dr_commence(struct isis_circuit *circuit, int level) circuit->circuit_id; assert(circuit->circuit_id); /* must be non-zero */ - /* if (circuit->t_send_l1_psnp) - thread_cancel (circuit->t_send_l1_psnp); */ lsp_generate_pseudo(circuit, 1); thread_add_timer(master, send_l1_csnp, circuit, @@ -307,8 +305,6 @@ int isis_dr_commence(struct isis_circuit *circuit, int level) circuit->circuit_id; assert(circuit->circuit_id); /* must be non-zero */ - /* if (circuit->t_send_l1_psnp) - thread_cancel (circuit->t_send_l1_psnp); */ lsp_generate_pseudo(circuit, 2); thread_add_timer(master, send_l2_csnp, circuit, |