From b21e0c937528765db57e6d9b10bf6429fa5787e3 Mon Sep 17 00:00:00 2001 From: Anuradha Karuppiah Date: Tue, 16 Apr 2019 18:49:28 -0700 Subject: pim: fix order of vxlan mroutes cleanup when pimd is shutdown 1. vxlan instance cleanup needs to be done before the upstream entries are force-flushed. 2. also vxlan callbacks need to be ignored post instance-cleanup. Signed-off-by: Anuradha Karuppiah --- pimd/pim_instance.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pimd/pim_instance.c') diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c index 1416d8de55..a2bf3d2783 100644 --- a/pimd/pim_instance.c +++ b/pimd/pim_instance.c @@ -36,6 +36,8 @@ static void pim_instance_terminate(struct pim_instance *pim) { + pim_vxlan_exit(pim); + if (pim->ssm_info) { pim_ssm_terminate(pim->ssm_info); pim->ssm_info = NULL; @@ -60,7 +62,6 @@ static void pim_instance_terminate(struct pim_instance *pim) pim_oil_terminate(pim); pim_msdp_exit(pim); - pim_vxlan_exit(pim); XFREE(MTYPE_PIM_PIM_INSTANCE, pim); } -- cgit v1.2.3