diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2022-01-28 08:55:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 08:55:12 +0200 |
| commit | 869f980af49a263aa00cb3c78a0e9aa621b4e4fe (patch) | |
| tree | abd3d9075ce014b11ff03c35d7093546d62fd7be | |
| parent | 4871e5d5bf2b4f59ffb8f25c307a4a25951df1cd (diff) | |
| parent | 0955f8757b4df61bf052072aceac6bcbae13f431 (diff) | |
Merge pull request #10420 from donaldsharp/zebra_multicast_vrf_cleanup
zebra: Actually delete the table we are looking for
| -rw-r--r-- | zebra/zebra_vrf.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c index 5913936d57..842dc3f576 100644 --- a/zebra/zebra_vrf.c +++ b/zebra/zebra_vrf.c @@ -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, |