Merge pull request #3602 from donaldsharp/mlag_debug

zebra cleanup and some mlag additions

1 files changed, 6 insertions, 0 deletions

diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c
index 3e94d6bca8..c3b861c242 100644
--- a/zebra/zebra_router.c
+++ b/zebra/zebra_router.c
@@ -188,6 +188,9 @@ void zebra_router_terminate(void)
 		zebra_router_free_table(zrt);
 	}
 
+	work_queue_free_and_null(&zrouter.ribq);
+	meta_queue_free(zrouter.mq);
+
 	zebra_vxlan_disable();
 	zebra_mlag_terminate();
 
@@ -206,6 +209,9 @@ void zebra_router_init(void)
 {
 	zrouter.sequence_num = 0;
 
+	zrouter.rtm_table_default = 0;
+	zrouter.packets_to_process = ZEBRA_ZAPI_PACKETS_TO_PROCESS;
+
 	zebra_vxlan_init();
 	zebra_mlag_init();