From 695b279ae3b564b3d850a6eb70e79dccd0c6d5d3 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Thu, 18 Nov 2021 07:32:01 -0500 Subject: [PATCH] zebra: free LSP workqueue early, revert PR 10050 this reverts commit dd9538c5f36f9d6110, which tried to clear the LSP workqueue late during shutdown. Signed-off-by: Mark Stapp --- zebra/main.c | 3 +++ zebra/zebra_router.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zebra/main.c b/zebra/main.c index 038022ceb2..275d9af5d2 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -183,6 +183,9 @@ static void sigint(void) } } + if (zrouter.lsp_process_q) + work_queue_free_and_null(&zrouter.lsp_process_q); + vrf_terminate(); ns_walk_func(zebra_ns_early_shutdown, NULL, NULL); diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c index 4ce756c953..a80c573855 100644 --- a/zebra/zebra_router.c +++ b/zebra/zebra_router.c @@ -235,9 +235,6 @@ void zebra_router_terminate(void) RB_FOREACH_SAFE (zrt, zebra_router_table_head, &zrouter.tables, tmp) zebra_router_free_table(zrt); - if (zrouter.lsp_process_q) - work_queue_free_and_null(&zrouter.lsp_process_q); - work_queue_free_and_null(&zrouter.ribq); meta_queue_free(zrouter.mq); -- 2.39.5