summaryrefslogtreecommitdiff
path: root/zebra/zebra_mpls.c
diff options
context:
space:
mode:
authorStephen Worley <sworley@cumulusnetworks.com>2019-07-02 01:16:48 -0400
committerStephen Worley <sworley@cumulusnetworks.com>2019-10-25 11:13:40 -0400
commit7f997721693c63afcdf1d23f7449f8acbbe282d1 (patch)
tree80efe9683ebb90d36f15b052022ee2ae40e91bec /zebra/zebra_mpls.c
parent139ddad8f12cf6dbf2993af196cc33476c2b79cf (diff)
zebra: Use nexthop/interface vrf, not the routes
When hashing/creating the NHE, use the nexthops vrf as its source of data. This is gotten directly from an interface and should not come from a route. Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
Diffstat (limited to 'zebra/zebra_mpls.c')
-rw-r--r--zebra/zebra_mpls.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index cbbb02be35..42d8c70f49 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -2658,7 +2658,7 @@ int mpls_ftn_update(int add, struct zebra_vrf *zvrf, enum lsp_types_t type,
}
if (found) {
- nhe = zebra_nhg_rib_find(0, &new_grp, re->vrf_id, afi);
+ nhe = zebra_nhg_rib_find(0, &new_grp, afi);
zebra_nhg_re_update_ref(re, nhe);
@@ -2922,8 +2922,7 @@ static void mpls_ftn_uninstall_all(struct zebra_vrf *zvrf,
if (CHECK_FLAG(re->status,
ROUTE_ENTRY_LABELS_CHANGED)) {
- nhe = zebra_nhg_rib_find(0, &new_grp,
- re->vrf_id, afi);
+ nhe = zebra_nhg_rib_find(0, &new_grp, afi);
zebra_nhg_re_update_ref(re, nhe);
}