mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-05 22:50:14 +00:00
Merge pull request #10420 from donaldsharp/zebra_multicast_vrf_cleanup
zebra: Actually delete the table we are looking for
This commit is contained in:
commit
869f980af4
@ -262,9 +262,6 @@ static int zebra_vrf_delete(struct vrf *vrf)
|
||||
{
|
||||
struct zebra_vrf *zvrf = vrf->info;
|
||||
struct other_route_table *otable;
|
||||
struct route_table *table;
|
||||
afi_t afi;
|
||||
safi_t safi;
|
||||
unsigned i;
|
||||
|
||||
assert(zvrf);
|
||||
@ -295,23 +292,6 @@ static int zebra_vrf_delete(struct vrf *vrf)
|
||||
zebra_vxlan_close_tables(zvrf);
|
||||
zebra_mpls_close_tables(zvrf);
|
||||
|
||||
/* release allocated memory */
|
||||
for (afi = AFI_IP; afi <= AFI_IP6; afi++) {
|
||||
for (safi = SAFI_UNICAST; safi <= SAFI_MULTICAST; safi++) {
|
||||
table = zvrf->table[afi][safi];
|
||||
if (table) {
|
||||
zebra_router_release_table(zvrf, zvrf->table_id,
|
||||
afi, safi);
|
||||
zvrf->table[afi][safi] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (zvrf->rnh_table[afi])
|
||||
route_table_finish(zvrf->rnh_table[afi]);
|
||||
if (zvrf->rnh_table_multicast[afi])
|
||||
route_table_finish(zvrf->rnh_table[afi]);
|
||||
}
|
||||
|
||||
otable = otable_pop(&zvrf->other_tables);
|
||||
while (otable) {
|
||||
zebra_router_release_table(zvrf, otable->table_id,
|
||||
|
Loading…
Reference in New Issue
Block a user