X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_output.c;h=2ab98e7e14085cc387ca96d6319de1294de650b8;hb=775f73c;hp=e020f2a6532b4baecf215cf23d67b2713956c2dc;hpb=2fab01ee0f9b406584272968863eee16a3bb1fb9;p=vpp.git

diff --git a/src/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c
index e020f2a6532..2ab98e7e140 100644
--- a/src/vnet/ipsec/ipsec_output.c
+++ b/src/vnet/ipsec/ipsec_output.c
@@ -419,17 +419,16 @@ ipsec_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   return from_frame->n_vectors;
 }
 
-static uword
-ipsec4_output_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		       vlib_frame_t * frame)
+VLIB_NODE_FN (ipsec4_output_node) (vlib_main_t * vm,
+				   vlib_node_runtime_t * node,
+				   vlib_frame_t * frame)
 {
   return ipsec_output_inline (vm, node, frame, 0);
 }
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec4_output_node,static) = {
-  .function = ipsec4_output_node_fn,
-  .name = "ipsec4-output",
+VLIB_REGISTER_NODE (ipsec4_output_node) = {
+  .name = "ipsec4-output-feature",
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_output_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -446,19 +445,16 @@ VLIB_REGISTER_NODE (ipsec4_output_node,static) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec4_output_node, ipsec4_output_node_fn);
-
-static uword
-ipsec6_output_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
-		       vlib_frame_t * frame)
+VLIB_NODE_FN (ipsec6_output_node) (vlib_main_t * vm,
+				   vlib_node_runtime_t * node,
+				   vlib_frame_t * frame)
 {
   return ipsec_output_inline (vm, node, frame, 1);
 }
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec6_output_node,static) = {
-  .function = ipsec6_output_node_fn,
-  .name = "ipsec6-output",
+VLIB_REGISTER_NODE (ipsec6_output_node) = {
+  .name = "ipsec6-output-feature",
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_output_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -475,7 +471,6 @@ VLIB_REGISTER_NODE (ipsec6_output_node,static) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec6_output_node, ipsec6_output_node_fn);
 #else /* IPSEC > 1 */
 
 /* Dummy ipsec output node, in case when IPSec is disabled */
@@ -492,13 +487,13 @@ ipsec_output_node_fn (vlib_main_t * vm,
 VLIB_REGISTER_NODE (ipsec4_output_node) = {
   .vector_size = sizeof (u32),
   .function = ipsec_output_node_fn,
-  .name = "ipsec4-output",
+  .name = "ipsec4-output-feature",
 };
 
 VLIB_REGISTER_NODE (ipsec6_output_node) = {
   .vector_size = sizeof (u32),
   .function = ipsec_output_node_fn,
-  .name = "ipsec6-output",
+  .name = "ipsec6-output-feature",
 };
 /* *INDENT-ON* */
 #endif