diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/dpo/mpls_disposition.c | 2 | ||||
| -rw-r--r-- | src/vnet/dpo/mpls_label_dpo.c | 2 | ||||
| -rw-r--r-- | src/vnet/mpls/mpls_tunnel.c | 21 |
3 files changed, 8 insertions, 17 deletions
diff --git a/src/vnet/dpo/mpls_disposition.c b/src/vnet/dpo/mpls_disposition.c index 2956e541d57..66f74f9b29f 100644 --- a/src/vnet/dpo/mpls_disposition.c +++ b/src/vnet/dpo/mpls_disposition.c @@ -162,7 +162,7 @@ mpls_label_disposition_inline (vlib_main_t * vm, { if (FIB_MPLS_LSP_MODE_PIPE == mode) error_node = - vlib_node_get_runtime(vm, ip6_mpls_label_disposition_uniform_node.index); + vlib_node_get_runtime(vm, ip6_mpls_label_disposition_pipe_node.index); else error_node = vlib_node_get_runtime(vm, ip6_mpls_label_disposition_uniform_node.index); diff --git a/src/vnet/dpo/mpls_label_dpo.c b/src/vnet/dpo/mpls_label_dpo.c index 954d637937b..ebbbbec9b64 100644 --- a/src/vnet/dpo/mpls_label_dpo.c +++ b/src/vnet/dpo/mpls_label_dpo.c @@ -639,7 +639,7 @@ mpls_label_imposition_inline (vlib_main_t * vm, ASSERT(0 != vnet_buffer (b3)->mpls.ttl); ttl3 = vnet_buffer(b3)->mpls.ttl - 1; - exp3 = vnet_buffer(b0)->mpls.exp; + exp3 = vnet_buffer(b3)->mpls.exp; hdr3 = mpls_label_paint_w_ttl_exp(b3, mld3, ttl3, exp3); } else diff --git a/src/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c index c2067d81b00..7ca2c12cbcf 100644 --- a/src/vnet/mpls/mpls_tunnel.c +++ b/src/vnet/mpls/mpls_tunnel.c @@ -129,23 +129,14 @@ mpls_tunnel_collect_forwarding (fib_node_index_t pl_index, */ path_ext->fpe_mpls_flags |= FIB_PATH_EXT_MPLS_FLAG_NO_IP_TTL_DECR; - if (NULL != path_ext) - { - /* - * found a matching extension. stack it to obtain the forwarding - * info for this path. - */ - ctx->next_hops = fib_path_ext_stack(path_ext, - ctx->fct, - ctx->fct, - ctx->next_hops); - } - else - ASSERT(0); /* - * else - * There should be a path-extenios associated with each path + * found a matching extension. stack it to obtain the forwarding + * info for this path. */ + ctx->next_hops = fib_path_ext_stack(path_ext, + ctx->fct, + ctx->fct, + ctx->next_hops); return (FIB_PATH_LIST_WALK_CONTINUE); } |