Merge pull request #2870 from AnuradhaKaruppiah/bgp-default-del

bgpd: unregister VNI learning from zebra on default instance delete
FRRouting · Aug 25, 2018 · a86b18d · a86b18d
2 parents 3492362 + de6058a
commit a86b18d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
@@ -3187,15 +3187,16 @@ int bgp_delete(struct bgp *bgp)
 				.import_redirect_rtlist);
 		bgp->vpn_policy[afi].import_redirect_rtlist = NULL;
 	}
-	/* Remove visibility via the master list - there may however still be
-	 * routes to be processed still referencing the struct bgp.
-	 */
-	listnode_delete(bm->bgp, bgp);
 
 	/* Deregister from Zebra, if needed */
 	if (IS_BGP_INST_KNOWN_TO_ZEBRA(bgp))
 		bgp_zebra_instance_deregister(bgp);
 
+	/* Remove visibility via the master list - there may however still be
+	 * routes to be processed still referencing the struct bgp.
+	 */
+	listnode_delete(bm->bgp, bgp);
+
 	/* Free interfaces in this instance. */
 	bgp_if_finish(bgp);