diff options
| author | Russ White <russ@riw.us> | 2021-10-06 01:27:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 01:27:23 +0200 |
| commit | 334d9d259f354b47aeced105ea4a68947ae3f81a (patch) | |
| tree | c536cab973e00c1a30e096947d1b22e71011f860 /isisd | |
| parent | Merge pull request #9728 from donaldsharp/null_thread (diff) | |
| parent | tools: Add coccinelle script to catch thread to NULL assignments (diff) | |
| download | frr-334d9d259f354b47aeced105ea4a68947ae3f81a.tar.xz frr-334d9d259f354b47aeced105ea4a68947ae3f81a.zip | |
Merge pull request #9731 from ton31337/fix/thread_null_set
cleanup: struct thread = NULL
Diffstat (limited to 'isisd')
| -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) |