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 /zebra/zebra_ptm.c | |
| parent | cb6c39645fae5211bd15b43a1b7879fb4c4b308c (diff) | |
| parent | 2783a6921c8fd3917caa539df82e0d9f2a23eb0c (diff) | |
Merge pull request #11657 from donaldsharp/why_timer
convert thread_cancel to THREAD_OFF
Diffstat (limited to 'zebra/zebra_ptm.c')
| -rw-r--r-- | zebra/zebra_ptm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index 3127d2d304..4a18eb021e 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -157,9 +157,9 @@ void zebra_ptm_finish(void) free(ptm_cb.in_data); /* Cancel events. */ - thread_cancel(&ptm_cb.t_read); - thread_cancel(&ptm_cb.t_write); - thread_cancel(&ptm_cb.t_timer); + THREAD_OFF(ptm_cb.t_read); + THREAD_OFF(ptm_cb.t_write); + THREAD_OFF(ptm_cb.t_timer); if (ptm_cb.wb) buffer_free(ptm_cb.wb); @@ -213,7 +213,7 @@ static int zebra_ptm_send_message(char *data, int size) ptm_cb.reconnect_time, &ptm_cb.t_timer); return -1; case BUFFER_EMPTY: - thread_cancel(&ptm_cb.t_write); + THREAD_OFF(ptm_cb.t_write); break; case BUFFER_PENDING: thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL, |