summaryrefslogtreecommitdiffstats
path: root/src/plugins/nsh/nsh_pop.c
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-02-26 02:59:07 -0800
committerDamjan Marion <dmarion@me.com>2019-02-26 20:18:46 +0000
commit4ba19b8a75c40cecd3818af2fd657fe5bf1b2f41 (patch)
treed79c028a1069612597178aa84ce9e112b9ea28cd /src/plugins/nsh/nsh_pop.c
parent849cbe225ea9c0358e3f2789c89d4b84d0f7b367 (diff)
nsh: migrate old MUTIARCH macros to VLIB_NODE_FN
Change-Id: Iafe8b3a38f2a7d7571e60db91608d8130bb07cb3 Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/plugins/nsh/nsh_pop.c')
-rw-r--r--src/plugins/nsh/nsh_pop.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/plugins/nsh/nsh_pop.c b/src/plugins/nsh/nsh_pop.c
index 682a92d178a..15d50fdfeea 100644
--- a/src/plugins/nsh/nsh_pop.c
+++ b/src/plugins/nsh/nsh_pop.c
@@ -30,20 +30,8 @@ extern nsh_option_map_t * nsh_md2_lookup_option (u16 class, u8 type);
extern u8 * format_nsh_header (u8 * s, va_list * args);
extern u8 * format_nsh_node_map_trace (u8 * s, va_list * args);
-
-/* format from network order */
-u8 * format_nsh_pop_header (u8 * s, va_list * args)
-{
- return format_nsh_header(s, args);
-}
-
-
-
-u8 * format_nsh_pop_node_map_trace (u8 * s, va_list * args)
-{
- return format_nsh_node_map_trace(s, args);
-}
-
+extern u8 * format_nsh_pop_header (u8 * s, va_list * args);
+extern u8 * format_nsh_pop_node_map_trace (u8 * s, va_list * args);
static uword
nsh_pop_inline (vlib_main_t * vm,
@@ -326,8 +314,7 @@ nsh_pop_inline (vlib_main_t * vm,
* @return from_frame->n_vectors
*
*/
-static uword
-nsh_pop (vlib_main_t * vm, vlib_node_runtime_t * node,
+VLIB_NODE_FN (nsh_pop) (vlib_main_t * vm, vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
return nsh_pop_inline (vm, node, from_frame);
@@ -341,7 +328,6 @@ static char * nsh_pop_node_error_strings[] = {
/* register nsh-input node */
VLIB_REGISTER_NODE (nsh_pop_node) = {
- .function = nsh_pop,
.name = "nsh-pop",
.vector_size = sizeof (u32),
.format_trace = format_nsh_pop_node_map_trace,
@@ -360,6 +346,3 @@ VLIB_REGISTER_NODE (nsh_pop_node) = {
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (nsh_pop_node, nsh_pop);
-
-