X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbier%2Fbier_output.c;h=e2cf7d62cee2c16a68164b849d20b64e674c55cd;hb=9c0a3c423ee0b9326f600a00c1bd46fef45d4975;hp=7f513fc7b48835ea8f94b1eb2b2bcab9ebc53cf9;hpb=586479a73162426a02b2bbc8ab724e0dfb9921e0;p=vpp.git

diff --git a/src/vnet/bier/bier_output.c b/src/vnet/bier/bier_output.c
index 7f513fc7b48..e2cf7d62cee 100644
--- a/src/vnet/bier/bier_output.c
+++ b/src/vnet/bier/bier_output.c
@@ -58,6 +58,7 @@ typedef struct bier_output_trace_t_
 {
     u32 next_index;
     index_t bfm_index;
+    mpls_label_t bfm_label;
 } bier_output_trace_t;
 
 static uword
@@ -69,7 +70,7 @@ bier_output (vlib_main_t * vm,
     u32 n_left_from, next_index, * from, * to_next;
     u32 thread_index;
 
-    thread_index = vlib_get_thread_index ();
+    thread_index = vm->thread_index;
     from = vlib_frame_vector_args (from_frame);
     n_left_from = from_frame->n_vectors;
 
@@ -163,6 +164,7 @@ bier_output (vlib_main_t * vm,
                 tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
                 tr->next_index = next0;
                 tr->bfm_index = bfmi0;
+                tr->bfm_label = bfm0->bfm_label;
             }
 
             vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -186,8 +188,8 @@ format_bier_output_trace (u8 * s, va_list * args)
     CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
     bier_output_trace_t * t = va_arg (*args, bier_output_trace_t *);
 
-    s = format (s, " next [%d], BFM index %d",
-                t->next_index, t->bfm_index);
+    s = format (s, " next [%d], BFM index %d label:%x",
+                t->next_index, t->bfm_index, t->bfm_label);
     return s;
 }