proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 04:26:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1776 from dslicenc/static-inactive-cm19675

Browse Source 
zebra: fix rnh deleting nht entry
This commit is contained in:
Russ White 2018-02-27 08:51:33 -05:00 committed by GitHub
commit 5cfb017a67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/zebra_rib.c
View File

@ -416,8 +416,6 @@ static int nexthop_active(afi_t afi, struct route_entry *re,
if (set) { if (set) {
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE); UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE);
zebra_deregister_rnh_static_nexthops(nexthop->vrf_id,
nexthop->resolved, top);
nexthops_free(nexthop->resolved); nexthops_free(nexthop->resolved);
nexthop->resolved = NULL; nexthop->resolved = NULL;
re->nexthop_mtu = 0; re->nexthop_mtu = 0;
@ -2112,7 +2110,9 @@ void rib_unlink(struct route_node *rn, struct route_entry *re)
dest->selected_fib = NULL; dest->selected_fib = NULL;
/* free RE and nexthops */ /* free RE and nexthops */
zebra_deregister_rnh_static_nexthops(re->vrf_id, re->nexthop, rn); if (re->type == ZEBRA_ROUTE_STATIC)
zebra_deregister_rnh_static_nexthops(re->vrf_id,
re->nexthop, rn);
nexthops_free(re->nexthop); nexthops_free(re->nexthop);
XFREE(MTYPE_RE, re); XFREE(MTYPE_RE, re);
} }