ETH:fix l2_len/vlan count mismatch for > 2 tags

l2_len was not updated for the third tag
as the ethernet node retracts by the vlan count after parse_header (using
ethernet_buffer_header_size) it ends up pointing before the ethernet header

+ some minor cleanups

Change-Id: I4ccaedd33928912e5d837376f146503b27071741
Signed-off-by: Eyal Bari <ebari@cisco.com>

1 files changed, 3 insertions, 12 deletions

diff --git a/src/vnet/l2/l2_input_vtr.c b/src/vnet/l2/l2_input_vtr.c
index 60a39631e87..ded23095849 100644
--- a/src/vnet/l2/l2_input_vtr.c
+++ b/src/vnet/l2/l2_input_vtr.c
@@ -188,10 +188,7 @@ l2_invtr_node_fn (vlib_main_t * vm,
 	      if (config0->output_vtr.push_and_pop_bytes)
 		{
 		  /* perform the tag rewrite on two packets */
-		  if (l2_vtr_process
-		      (b0,
-		       &(vec_elt_at_index
-			 (l2output_main.configs, sw_if_index0)->input_vtr)))
+		  if (l2_vtr_process (b0, &config0->input_vtr))
 		    {
 		      /* Drop packet */
 		      next0 = L2_INVTR_NEXT_DROP;
@@ -212,10 +209,7 @@ l2_invtr_node_fn (vlib_main_t * vm,
 	    {
 	      if (config1->output_vtr.push_and_pop_bytes)
 		{
-		  if (l2_vtr_process
-		      (b1,
-		       &(vec_elt_at_index
-			 (l2output_main.configs, sw_if_index1)->input_vtr)))
+		  if (l2_vtr_process (b1, &config1->input_vtr))
 		    {
 		      /* Drop packet */
 		      next1 = L2_INVTR_NEXT_DROP;
@@ -305,10 +299,7 @@ l2_invtr_node_fn (vlib_main_t * vm,
 	      if (config0->output_vtr.push_and_pop_bytes)
 		{
 		  /* perform the tag rewrite on one packet */
-		  if (l2_vtr_process
-		      (b0,
-		       &(vec_elt_at_index
-			 (l2output_main.configs, sw_if_index0)->input_vtr)))
+		  if (l2_vtr_process (b0, &config0->input_vtr))
 		    {
 		      /* Drop packet */
 		      next0 = L2_INVTR_NEXT_DROP;