diff options
| author | Russ White <russ@riw.us> | 2018-08-24 20:19:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 20:19:17 -0400 |
| commit | a86b18d82fb9d24f61c50893cb319bf772609c8b (patch) | |
| tree | 8388824101631d7f82089d8ef8a3f8a13753ad4f | |
| parent | 34923629255fa9f458ef14e284f3a2957a0bdf32 (diff) | |
| parent | de6058ab915c50cdc7b19b544b519c4b9b4543d6 (diff) | |
Merge pull request #2870 from AnuradhaKaruppiah/bgp-default-del
bgpd: unregister VNI learning from zebra on default instance delete
| -rw-r--r-- | bgpd/bgpd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 5d9609ae01..7ff5053ce3 100644 --- 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); |