X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fout2in.c;h=156b7283fef3aa2f97d1c6df9f0b1a74904001c3;hb=c79396e1f8ba395f3d6625f463cd9a6c8d505799;hp=ecfabc9c07a934b0a55a7ef1330ba9e0c174c66c;hpb=067cd6229a47ea3ba8b59a2a04090e80afb5bd2c;p=vpp.git

diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c
index ecfabc9c07a..156b7283fef 100755
--- a/src/plugins/nat/out2in.c
+++ b/src/plugins/nat/out2in.c
@@ -786,8 +786,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
 		      && (udp0->dst_port ==
 			  clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client))))
 		    {
-		      vnet_feature_next
-			(vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0);
+		      vnet_feature_next (&next0, b0);
 		      goto trace0;
 		    }
 
@@ -795,8 +794,8 @@ snat_out2in_node_fn (vlib_main_t * vm,
                     {
                       b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
                       next0 = SNAT_OUT2IN_NEXT_DROP;
-                      goto trace0;
                     }
+                  goto trace0;
                 }
 
               /* Create session initiated by host from external network */
@@ -938,8 +937,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
 		      && (udp1->dst_port ==
 			  clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client))))
 		    {
-		      vnet_feature_next
-			(vnet_buffer (b1)->sw_if_index[VLIB_RX], &next1, b1);
+		      vnet_feature_next (&next1, b1);
 		      goto trace1;
 		    }
 
@@ -947,8 +945,8 @@ snat_out2in_node_fn (vlib_main_t * vm,
                     {
                       b1->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
                       next1 = SNAT_OUT2IN_NEXT_DROP;
-                      goto trace1;
                     }
+                  goto trace1;
                 }
 
               /* Create session initiated by host from external network */
@@ -1126,8 +1124,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
 		      && (udp0->dst_port ==
 			  clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client))))
 		    {
-		      vnet_feature_next
-			(vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0);
+		      vnet_feature_next (&next0, b0);
 		      goto trace00;
 		    }
 
@@ -1135,8 +1132,8 @@ snat_out2in_node_fn (vlib_main_t * vm,
                     {
                       b0->error = node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
                       next0 = SNAT_OUT2IN_NEXT_DROP;
-                      goto trace00;
                     }
+                  goto trace00;
                 }
 
               /* Create session initiated by host from external network */
@@ -1352,9 +1349,7 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm,
                           && (udp0->dst_port
                               == clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client))))
 			{
-                          vnet_feature_next
-                            (vnet_buffer (b0)->sw_if_index[VLIB_RX],
-                             &next0, b0);
+                          vnet_feature_next (&next0, b0);
                           goto trace0;
                         }
 
@@ -2182,8 +2177,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                           && (udp0->dst_port ==
                           clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client))))
                         {
-                          vnet_feature_next
-                            (vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0);
+                          vnet_feature_next (&next0, b0);
                           goto trace00;
                         }
 
@@ -2386,8 +2380,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                           && (udp1->dst_port ==
                           clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client))))
                         {
-                          vnet_feature_next
-                            (vnet_buffer (b1)->sw_if_index[VLIB_RX], &next1, b1);
+                          vnet_feature_next (&next1, b1);
                           goto trace01;
                         }
 
@@ -2622,8 +2615,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                           && (udp0->dst_port ==
                           clib_host_to_net_u16(UDP_DST_PORT_dhcp_to_client))))
                         {
-                          vnet_feature_next
-                            (vnet_buffer (b0)->sw_if_index[VLIB_RX], &next0, b0);
+                          vnet_feature_next (&next0, b0);
                           goto trace0;
                         }
 
@@ -3700,7 +3692,7 @@ snat_out2in_fast_node_fn (vlib_main_t * vm,
           sw_if_index0 = vnet_buffer(b0)->sw_if_index[VLIB_RX];
 	  rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index(sw_if_index0);
 
-	  vnet_feature_next (sw_if_index0, &next0, b0);
+	  vnet_feature_next (&next0, b0);
 
           if (PREDICT_FALSE(ip0->ttl == 1))
             {