BGP: Unlink BGP instance from VRF only at the end of deletion

Additional change missed out in earlier commit. Updates
d3f5a0d3f5.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Ticket: CM-10930
Reviewed By: CCR-4717
Testing Done: Manual, bgp-smoke
This commit is contained in:
vivek 2016-05-14 16:07:18 -07:00
parent c18b680fc0
commit 4ac8232115

View File

@ -3144,9 +3144,6 @@ bgp_free (struct bgp *bgp)
bgp->peerhash = NULL;
}
if (bgp->name)
XFREE(MTYPE_BGP, bgp->name);
for (afi = AFI_IP; afi < AFI_MAX; afi++)
for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
{
@ -3163,6 +3160,9 @@ bgp_free (struct bgp *bgp)
if (vrf)
bgp_vrf_unlink (bgp, vrf);
if (bgp->name)
XFREE(MTYPE_BGP, bgp->name);
XFREE (MTYPE_BGP, bgp);
}