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>

diff --git a/isisd/fabricd.c b/isisd/fabricd.c
index 20651706d394931f33fd6ef9b40d122f750721a4..0f10a1516a1528afa4763ef2b8b3f6d8f42d90cd 100644 (file)
--- 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 c7266152b70697055cf0b2f9263b715e92c46f9c..d3da5b9d39aba480cf7f24a522db253262a493eb 100644 (file)
--- 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)