zebra: free LSP workqueue later during shutdown

Free the LSP workqueue later during shutdown, so that zebra
has enough time to clean up and uninstall any LSPs.

Signed-off-by: Mark Stapp <mstapp@nvidia.com>

diff --git a/zebra/main.c b/zebra/main.c
index 6162d36b4358df8855a1ecefbfdf005c345a56fd..cca7b49962a4213ac4b4e570db4afbd5531e4069 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -182,8 +182,6 @@ static void sigint(void)
                                SET_FLAG(zvrf->flags, ZEBRA_VRF_RETAIN);
                }
        }
-       if (zrouter.lsp_process_q)
-               work_queue_free_and_null(&zrouter.lsp_process_q);
 
        vrf_terminate();
 

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index a80c5738551c89dd61c70273e6d9a9c348e0a0bf..4ce756c953e9d588442175c2ef661ff728a57785 100644 (file)
--- a/zebra/zebra_router.c
+++ b/zebra/zebra_router.c
@@ -235,6 +235,9 @@ 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);