X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_l2.c;h=a289158c7f388d2d936a4678c95569beab2ce3d3;hb=8feeaff56fa9a4fbdfc06131f28a1060ffd9645d;hp=132ceb281684894e4b422d5ef91d1b4c5b8fa98c;hpb=db14f5aff69311d13a0a90baa3567e92f3faa783;p=vpp.git

diff --git a/src/vnet/adj/adj_l2.c b/src/vnet/adj/adj_l2.c
index 132ceb28168..a289158c7f3 100644
--- a/src/vnet/adj/adj_l2.c
+++ b/src/vnet/adj/adj_l2.c
@@ -91,6 +91,11 @@ adj_l2_rewrite_inline (vlib_main_t * vm,
 	    rw_len0 = adj0[0].rewrite_header.data_bytes;
 	    vnet_buffer(p0)->ip.save_rewrite_length = rw_len0;
             vnet_buffer(p0)->sw_if_index[VLIB_TX] = adj0->rewrite_header.sw_if_index;
+            /* since we are coming out of the L2 world, where the vlib_buffer
+             * union is used for other things, make sure it is clean for
+             * MPLS from now on.
+             */
+            vnet_buffer(p0)->mpls.first = 0;
 
 	    vlib_increment_combined_counter(&adjacency_counters,
                                             thread_index,
@@ -103,7 +108,7 @@ adj_l2_rewrite_inline (vlib_main_t * vm,
 			      adj0[0].rewrite_header.max_l3_packet_bytes)))
 	    {
 		/* Don't adjust the buffer for ttl issue; icmp-error node wants
-		 * to see the IP headerr */
+		 * to see the IP header */
 		p0->current_data -= rw_len0;
 		p0->current_length += rw_len0;
 		tx_sw_if_index0 = adj0[0].rewrite_header.sw_if_index;
@@ -147,16 +152,14 @@ adj_l2_rewrite_inline (vlib_main_t * vm,
     return frame->n_vectors;
 }
 
-static uword
-adj_l2_rewrite (vlib_main_t * vm,
+VLIB_NODE_FN (adj_l2_rewrite_node) (vlib_main_t * vm,
 		vlib_node_runtime_t * node,
 		vlib_frame_t * frame)
 {
     return adj_l2_rewrite_inline (vm, node, frame, 0);
 }
 
-static uword
-adj_l2_midchain (vlib_main_t * vm,
+VLIB_NODE_FN (adj_l2_midchain_node) (vlib_main_t * vm,
 		 vlib_node_runtime_t * node,
 		 vlib_frame_t * frame)
 {
@@ -164,7 +167,6 @@ adj_l2_midchain (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (adj_l2_rewrite_node) = {
-    .function = adj_l2_rewrite,
     .name = "adj-l2-rewrite",
     .vector_size = sizeof (u32),
 
@@ -176,10 +178,7 @@ VLIB_REGISTER_NODE (adj_l2_rewrite_node) = {
     },
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_rewrite_node, adj_l2_rewrite)
-
 VLIB_REGISTER_NODE (adj_l2_midchain_node) = {
-    .function = adj_l2_midchain,
     .name = "adj-l2-midchain",
     .vector_size = sizeof (u32),
 
@@ -190,5 +189,3 @@ VLIB_REGISTER_NODE (adj_l2_midchain_node) = {
 	[ADJ_L2_REWRITE_NEXT_DROP] = "error-drop",
     },
 };
-
-VLIB_NODE_FUNCTION_MULTIARCH (adj_l2_midchain_node, adj_l2_midchain)