From ae84497d13b2970febfa71b45b6d4b021bb27804 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 7 Oct 2021 13:20:15 +0300 Subject: [PATCH] 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 --- isisd/fabricd.c | 2 -- isisd/isis_spf.c | 1 - 2 files changed, 3 deletions(-) diff --git a/isisd/fabricd.c b/isisd/fabricd.c index 0f10a1516a..2937df992c 100644 --- 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 45e89897ff..5718b48b9d 100644 --- 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) -- 2.39.5