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 0f10a1516a1528afa4763ef2b8b3f6d8f42d90cd..2937df992c65ba2f860a17ebf0e71c70d10e9e68 100644 (file)
--- a/isisd/fabricd.c
+++ b/isisd/fabricd.c
@@ -258,7 +258,6 @@ static int fabricd_initial_sync_timeout(struct thread *thread)
                  f->initial_sync_circuit->interface->name);
        f->initial_sync_state = FABRICD_SYNC_PENDING;
        f->initial_sync_circuit = NULL;
-       f->initial_sync_timeout = NULL;
        return 0;
 }
 
@@ -403,7 +402,6 @@ static uint8_t fabricd_calculate_fabric_tier(struct isis_area *area)
 static int fabricd_tier_set_timer(struct thread *thread)
 {
        struct fabricd *f = THREAD_ARG(thread);
-       f->tier_set_timer = NULL;
 
        fabricd_set_tier(f, f->tier_pending);
        return 0;

diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 45e89897ffa43a1d47e5dcd808816a8be3f1f0d1..5718b48b9d42c23d4d9d6ebd1f10c808e28823c8 100644 (file)
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -1840,7 +1840,6 @@ static int isis_run_spf_cb(struct thread *thread)
        int have_run = 0;
 
        XFREE(MTYPE_ISIS_SPF_RUN, run);
-       area->spf_timer[level - 1] = NULL;
 
        if (!(area->is_type & level)) {
                if (IS_DEBUG_SPF_EVENTS)