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_packet.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_packet.c')
| -rw-r--r-- | ospfd/ospf_packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index c319f8068a..4b3f30a3f1 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -466,7 +466,7 @@ static void ospf_ls_req_timer(struct thread *thread) void ospf_ls_req_event(struct ospf_neighbor *nbr) { - thread_cancel(&nbr->t_ls_req); + THREAD_OFF(nbr->t_ls_req); thread_add_event(master, ospf_ls_req_timer, nbr, 0, &nbr->t_ls_req); } @@ -4103,7 +4103,7 @@ static void ospf_ls_upd_queue_send(struct ospf_interface *oi, * is actually turned off. */ if (list_isempty(oi->ospf->oi_write_q)) - OSPF_TIMER_OFF(oi->ospf->t_write); + THREAD_OFF(oi->ospf->t_write); } else { /* Hook thread to write packet. */ OSPF_ISM_WRITE_ON(oi->ospf); |