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 /ospfd/ospf_neighbor.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'ospfd/ospf_neighbor.c')
| -rw-r--r-- | ospfd/ospf_neighbor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ospfd/ospf_neighbor.c b/ospfd/ospf_neighbor.c index c59734b9f3..02c44dcdc1 100644 --- a/ospfd/ospf_neighbor.c +++ b/ospfd/ospf_neighbor.c @@ -140,17 +140,17 @@ void ospf_nbr_free(struct ospf_neighbor *nbr) } /* Cancel all timers. */ - OSPF_NSM_TIMER_OFF(nbr->t_inactivity); - OSPF_NSM_TIMER_OFF(nbr->t_db_desc); - OSPF_NSM_TIMER_OFF(nbr->t_ls_req); - OSPF_NSM_TIMER_OFF(nbr->t_ls_upd); + THREAD_OFF(nbr->t_inactivity); + THREAD_OFF(nbr->t_db_desc); + THREAD_OFF(nbr->t_ls_req); + THREAD_OFF(nbr->t_ls_upd); /* Cancel all events. */ /* Thread lookup cost would be negligible. */ thread_cancel_event(master, nbr); bfd_sess_free(&nbr->bfd_session); - OSPF_NSM_TIMER_OFF(nbr->gr_helper_info.t_grace_timer); + THREAD_OFF(nbr->gr_helper_info.t_grace_timer); nbr->oi = NULL; XFREE(MTYPE_OSPF_NEIGHBOR, nbr); @@ -456,7 +456,7 @@ static struct ospf_neighbor *ospf_nbr_add(struct ospf_interface *oi, nbr->nbr_nbma = nbr_nbma; if (nbr_nbma->t_poll) - OSPF_POLL_TIMER_OFF(nbr_nbma->t_poll); + THREAD_OFF(nbr_nbma->t_poll); nbr->state_change = nbr_nbma->state_change + 1; } |