commit 2c49ffeb251d4eb11368ca8f866020e317ac09fb
author Filip Tehlar <ftehlar@cisco.com> Wed Mar 06 07:16:08 2019 -0800
committer Florin Coras <florin.coras@gmail.com> Wed Mar 06 18:13:44 2019 +0000
tree 037cbf37ed71c500a7b40d12729a69affb6002dd
parent 653e43f06a974121343b2c1f0e4533926020877b

udp: migrate old MULTIARCH macros to VLIB_NODE_FN

Change-Id: I2b324c77df2685a0bdfb617fb484022daf017d0b
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

src/vnet/udp/udp_encap_node.c

diff --git a/src/vnet/udp/udp_encap_node.c b/src/vnet/udp/udp_encap_node.c
index abf19fa..af0afb1 100644
--- a/src/vnet/udp/udp_encap_node.c
+++ b/src/vnet/udp/udp_encap_node.c
@@ -247,23 +247,22 @@
   return frame->n_vectors;
 }
 
-static uword
-udp4_encap (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (udp4_encap_node) (vlib_main_t * vm,
+				vlib_node_runtime_t * node,
+				vlib_frame_t * frame)
 {
   return udp_encap_inline (vm, node, frame, 0);
 }
 
-static uword
-udp6_encap (vlib_main_t * vm,
-	    vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (udp6_encap_node) (vlib_main_t * vm,
+				vlib_node_runtime_t * node,
+				vlib_frame_t * frame)
 {
   return udp_encap_inline (vm, node, frame, 1);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (udp4_encap_node) = {
-  .function = udp4_encap,
   .name = "udp4-encap",
   .vector_size = sizeof (u32),
 
@@ -271,10 +270,8 @@
 
   .n_next_nodes = 0,
 };
-VLIB_NODE_FUNCTION_MULTIARCH (udp4_encap_node, udp4_encap);
 
 VLIB_REGISTER_NODE (udp6_encap_node) = {
-  .function = udp6_encap,
   .name = "udp6-encap",
   .vector_size = sizeof (u32),
 
@@ -282,7 +279,6 @@
 
   .n_next_nodes = 0,
 };
-VLIB_NODE_FUNCTION_MULTIARCH (udp6_encap_node, udp6_encap);
 /* *INDENT-ON* */