ikev2: add support for custom ipsec-over-udp port

[vpp.git] / src / vnet / devices / af_packet / node.c

diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c
index 2aa52e0..196c088 100644 (file)
--- a/src/vnet/devices/af_packet/node.c
+++ b/src/vnet/devices/af_packet/node.c
@@ -195,9 +195,6 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   u32 n_buffer_bytes = vlib_buffer_get_default_data_size (vm);
   u32 min_bufs = apif->rx_req->tp_frame_size / n_buffer_bytes;
 
-  if (apif->per_interface_next_index != ~0)
-    next_index = apif->per_interface_next_index;
-
   n_free_bufs = vec_len (apm->rx_buffers[thread_index]);
   if (PREDICT_FALSE (n_free_bufs < VLIB_FRAME_SIZE))
     {
@@ -302,6 +299,10 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
          else
            {
              next0 = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
+
+             if (PREDICT_FALSE (apif->per_interface_next_index != ~0))
+               next0 = apif->per_interface_next_index;
+
              /* redirect if feature path enabled */
              vnet_feature_start_device_input_x1 (apif->sw_if_index, &next0,
                                                  first_b0);
@@ -345,9 +346,9 @@ af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   return n_rx_packets;
 }
 
-static uword
-af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-                   vlib_frame_t * frame)
+VLIB_NODE_FN (af_packet_input_node) (vlib_main_t * vm,
+                                    vlib_node_runtime_t * node,
+                                    vlib_frame_t * frame)
 {
   u32 n_rx_packets = 0;
   af_packet_main_t *apm = &af_packet_main;
@@ -367,8 +368,8 @@ af_packet_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (af_packet_input_node) = {
-  .function = af_packet_input_fn,
   .name = "af-packet-input",
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
   .sibling_of = "device-input",
   .format_trace = format_af_packet_input_trace,
   .type = VLIB_NODE_TYPE_INPUT,
@@ -376,8 +377,6 @@ VLIB_REGISTER_NODE (af_packet_input_node) = {
   .n_errors = AF_PACKET_INPUT_N_ERROR,
   .error_strings = af_packet_input_error_strings,
 };
-
-VLIB_NODE_FUNCTION_MULTIARCH (af_packet_input_node, af_packet_input_fn)
 /* *INDENT-ON* */