3 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/pppoe/CMakeLists.txt b/src/plugins/pppoe/CMakeLists.txt
index 61ed7a4eb09..33f9b57230b 100644
--- a/src/plugins/pppoe/CMakeLists.txt
+++ b/src/plugins/pppoe/CMakeLists.txt
@@ -19,6 +19,10 @@ add_vpp_plugin(pppoe
   pppoe_cp_node.c
   pppoe_decap.c
 
+  MULTIARCH_SOURCES
+  pppoe_cp_node.c
+  pppoe_decap.c
+
   API_FILES
   pppoe.api
 
diff --git a/src/plugins/pppoe/pppoe_cp_node.c b/src/plugins/pppoe/pppoe_cp_node.c
index 884d207d655..3f866450cfb 100644
--- a/src/plugins/pppoe/pppoe_cp_node.c
+++ b/src/plugins/pppoe/pppoe_cp_node.c
@@ -19,8 +19,6 @@
 #include <vnet/ppp/packet.h>
 #include <pppoe/pppoe.h>
 
-vlib_node_registration_t pppoe_cp_dispatch_node;
-
 #define foreach_pppoe_cp_next        \
 _(DROP, "error-drop")                  \
 _(INTERFACE, "interface-output" )      \
@@ -66,8 +64,7 @@ static u8 * format_pppoe_cp_trace (u8 * s, va_list * args)
   return s;
 }
 
-static uword
-pppoe_cp_dispatch (vlib_main_t * vm,
+VLIB_NODE_FN (pppoe_cp_dispatch_node) (vlib_main_t * vm,
                     vlib_node_runtime_t * node,
                     vlib_frame_t * from_frame)
 {
@@ -236,7 +233,6 @@ pppoe_cp_dispatch (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (pppoe_cp_dispatch_node) = {
-  .function = pppoe_cp_dispatch,
   .name = "pppoe-cp-dispatch",
   /* Takes a vector of packets. */
   .vector_size = sizeof (u32),
@@ -251,5 +247,3 @@ VLIB_REGISTER_NODE (pppoe_cp_dispatch_node) = {
   .format_trace = format_pppoe_cp_trace,
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (pppoe_cp_dispatch_node, pppoe_cp_dispatch)
-
diff --git a/src/plugins/pppoe/pppoe_decap.c b/src/plugins/pppoe/pppoe_decap.c
index 4f9e766e7f1..256dd83e43d 100644
--- a/src/plugins/pppoe/pppoe_decap.c
+++ b/src/plugins/pppoe/pppoe_decap.c
@@ -46,8 +46,7 @@ static u8 * format_pppoe_rx_trace (u8 * s, va_list * args)
   return s;
 }
 
-static uword
-pppoe_input (vlib_main_t * vm,
+VLIB_NODE_FN (pppoe_input_node) (vlib_main_t * vm,
              vlib_node_runtime_t * node,
              vlib_frame_t * from_frame)
 {
@@ -399,7 +398,6 @@ static char * pppoe_error_strings[] = {
 };
 
 VLIB_REGISTER_NODE (pppoe_input_node) = {
-  .function = pppoe_input,
   .name = "pppoe-input",
   /* Takes a vector of packets. */
   .vector_size = sizeof (u32),
@@ -417,6 +415,4 @@ VLIB_REGISTER_NODE (pppoe_input_node) = {
   .format_trace = format_pppoe_rx_trace,
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (pppoe_input_node, pppoe_input)
-