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 <mstapp@nvidia.com>

diff --git a/zebra/main.c b/zebra/main.c
index 038022ceb28649d8a6e1f82f94549824909de1ab..275d9af5d215b2abc97f39e146e29ca0f8606836 100644 (file)
--- 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 4ce756c953e9d588442175c2ef661ff728a57785..a80c5738551c89dd61c70273e6d9a9c348e0a0bf 100644 (file)
--- 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);