diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2019-02-25 17:59:28 -0500 |
|---|---|---|
| committer | Stephen Worley <sworley@cumulusnetworks.com> | 2019-10-25 11:13:36 -0400 |
| commit | 8b5bdc8bdfdb95d5e22ccb8733dbd35c84f3f79d (patch) | |
| tree | df4259f0aa0f915330f7199c2d9e395d88dcda52 /zebra/zebra_rib.c | |
| parent | 98fd05580ce702cae1dc403dfd45ae18a6df87cd (diff) | |
zebra: Remove afi field in nexthop hash entry
I do not believe we should be hashing based on AFI
in for our upper level nexthop group entries. These
should be ambiguous with regards to address families since
an ipv4 or ipv6 address can have the same interface
nexthop. This can be seen in NEXTHOP_TYPE_IFINDEX.
Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index d3c6f5ba11..c8684c1a93 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -2411,8 +2411,7 @@ void rib_unlink(struct route_node *rn, struct route_entry *re) if (dest->selected_fib == re) dest->selected_fib = NULL; - info = srcdest_rnode_table_info(rn); - zebra_nhg_release(info->afi, re); + zebra_nhg_release(re); nexthops_free(re->ng->nexthop); nexthop_group_delete(&re->ng); @@ -2659,7 +2658,7 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p, if (src_p) apply_mask_ipv6(src_p); - zebra_nhg_find(afi, re->ng, re); + zebra_nhg_find(re->ng, re); /* Set default distance by route type. */ if (re->distance == 0) re->distance = route_distance(re->type); |