diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-10-04 18:24:54 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-10-04 18:24:54 +0200 |
| commit | c34d552dd5fe8a6821ec5efee2eb463fe3108424 (patch) | |
| tree | e72da641b592e210ab6d6fe146b687daa3c38e52 | |
| parent | bfdd: Do not explicitly set the thread pointer to NULL (diff) | |
| download | frr-c34d552dd5fe8a6821ec5efee2eb463fe3108424.tar.xz frr-c34d552dd5fe8a6821ec5efee2eb463fe3108424.zip | |
isisd: Do not explicitly set the thread pointer to NULL
FRR should only ever use the appropriate THREAD_ON/THREAD_OFF
semantics. This is espacially true for the functions we
end up calling the thread for.
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
| -rw-r--r-- | isisd/fabricd.c | 1 | ||||
| -rw-r--r-- | isisd/isis_tx_queue.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/isisd/fabricd.c b/isisd/fabricd.c index 20651706d..0f10a1516 100644 --- a/isisd/fabricd.c +++ b/isisd/fabricd.c @@ -413,7 +413,6 @@ static int fabricd_tier_calculation_cb(struct thread *thread) { struct fabricd *f = THREAD_ARG(thread); uint8_t tier = ISIS_TIER_UNDEFINED; - f->tier_calculation_timer = NULL; tier = fabricd_calculate_fabric_tier(f->area); if (tier == ISIS_TIER_UNDEFINED) diff --git a/isisd/isis_tx_queue.c b/isisd/isis_tx_queue.c index c7266152b..d3da5b9d3 100644 --- a/isisd/isis_tx_queue.c +++ b/isisd/isis_tx_queue.c @@ -119,7 +119,6 @@ static int tx_queue_send_event(struct thread *thread) struct isis_tx_queue_entry *e = THREAD_ARG(thread); struct isis_tx_queue *queue = e->queue; - e->retry = NULL; thread_add_timer(master, tx_queue_send_event, e, 5, &e->retry); if (e->is_retry) |