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_tx_queue.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_tx_queue.c')
| -rw-r--r-- | isisd/isis_tx_queue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/isisd/isis_tx_queue.c b/isisd/isis_tx_queue.c index 078329221a..06369c6d70 100644 --- a/isisd/isis_tx_queue.c +++ b/isisd/isis_tx_queue.c @@ -92,7 +92,7 @@ static void tx_queue_element_free(void *element) { struct isis_tx_queue_entry *e = element; - thread_cancel(&(e->retry)); + THREAD_OFF(e->retry); XFREE(MTYPE_TX_QUEUE_ENTRY, e); } @@ -161,7 +161,7 @@ void _isis_tx_queue_add(struct isis_tx_queue *queue, e->type = type; - thread_cancel(&(e->retry)); + THREAD_OFF(e->retry); thread_add_event(master, tx_queue_send_event, e, 0, &e->retry); e->is_retry = false; @@ -184,7 +184,7 @@ void _isis_tx_queue_del(struct isis_tx_queue *queue, struct isis_lsp *lsp, func, file, line); } - thread_cancel(&(e->retry)); + THREAD_OFF(e->retry); hash_release(queue->hash, e); XFREE(MTYPE_TX_QUEUE_ENTRY, e); |