zebra: free LSP workqueue early, revert PR 10050

this reverts commit dd9538c5f3, which tried to clear
the LSP workqueue late during shutdown.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
This commit is contained in:
Mark Stapp 2021-11-18 07:32:01 -05:00
parent de093103cb
commit 695b279ae3
2 changed files with 3 additions and 3 deletions

View File

@ -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);

View File

@ -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);