diff options
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/zapi_msg.c | 8 | ||||
| -rw-r--r-- | zebra/zebra_mpls.c | 6 | ||||
| -rw-r--r-- | zebra/zebra_mpls.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 6915d84c0d..15ff4a8b97 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1788,14 +1788,14 @@ static void zread_mpls_labels(ZAPI_HANDLER_ARGS) mpls_lsp_install(zvrf, zl.type, zl.local_label, zl.remote_label, gtype, &zl.nexthop, zl.ifindex); mpls_ftn_update(1, zvrf, zl.type, &zl.prefix, gtype, - &zl.nexthop, zl.ifindex, zl.distance, - zl.remote_label); + &zl.nexthop, zl.ifindex, zl.route_type, + zl.route_instance, zl.remote_label); } else if (hdr->command == ZEBRA_MPLS_LABELS_DELETE) { mpls_lsp_uninstall(zvrf, zl.type, zl.local_label, gtype, &zl.nexthop, zl.ifindex); mpls_ftn_update(0, zvrf, zl.type, &zl.prefix, gtype, - &zl.nexthop, zl.ifindex, zl.distance, - zl.remote_label); + &zl.nexthop, zl.ifindex, zl.route_type, + zl.route_instance, zl.remote_label); } } diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index 5214f1f22d..897c525949 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -2542,8 +2542,8 @@ static bool mpls_ftn_update_nexthop(int add, struct nexthop *nexthop, */ int mpls_ftn_update(int add, struct zebra_vrf *zvrf, enum lsp_types_t type, struct prefix *prefix, enum nexthop_types_t gtype, - union g_addr *gate, ifindex_t ifindex, uint8_t distance, - mpls_label_t out_label) + union g_addr *gate, ifindex_t ifindex, uint8_t route_type, + unsigned short route_instance, mpls_label_t out_label) { struct route_table *table; struct route_node *rn; @@ -2562,7 +2562,7 @@ int mpls_ftn_update(int add, struct zebra_vrf *zvrf, enum lsp_types_t type, RNODE_FOREACH_RE (rn, re) { if (CHECK_FLAG(re->status, ROUTE_ENTRY_REMOVED)) continue; - if (re->distance == distance) + if (re->type == route_type && re->instance == route_instance) break; } diff --git a/zebra/zebra_mpls.h b/zebra/zebra_mpls.h index d983221cb5..506b51a536 100644 --- a/zebra/zebra_mpls.h +++ b/zebra/zebra_mpls.h @@ -269,8 +269,8 @@ void zebra_mpls_print_fec(struct vty *vty, struct zebra_vrf *zvrf, */ int mpls_ftn_update(int add, struct zebra_vrf *zvrf, enum lsp_types_t type, struct prefix *prefix, enum nexthop_types_t gtype, - union g_addr *gate, ifindex_t ifindex, uint8_t distance, - mpls_label_t out_label); + union g_addr *gate, ifindex_t ifindex, uint8_t route_type, + unsigned short route_instance, mpls_label_t out_label); /* * Install/update a NHLFE for an LSP in the forwarding table. This may be |