From e69e423743630b52e13db58c3f0229df8a46c07f Mon Sep 17 00:00:00 2001 From: Filip Varga Date: Wed, 13 Feb 2019 01:42:59 -0800 Subject: NAT: VPP-1552 code migration from old multiarch scheme Change-Id: I88f3df8aaa521e7707ef3335acdbf1ab41e7ee28 Signed-off-by: Filip Varga --- src/plugins/nat/dslite_out2in.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/plugins/nat/dslite_out2in.c') diff --git a/src/plugins/nat/dslite_out2in.c b/src/plugins/nat/dslite_out2in.c index 798367db6b1..18f9a577923 100644 --- a/src/plugins/nat/dslite_out2in.c +++ b/src/plugins/nat/dslite_out2in.c @@ -15,8 +15,6 @@ #include #include -vlib_node_registration_t dslite_out2in_node; - typedef enum { DSLITE_OUT2IN_NEXT_IP4_LOOKUP, @@ -94,9 +92,9 @@ done: return n; } -static uword -dslite_out2in_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (dslite_out2in_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; dslite_out2in_next_t next_index; @@ -105,7 +103,7 @@ dslite_out2in_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, f64 now = vlib_time_now (vm); dslite_main_t *dm = &dslite_main; - error_node = vlib_node_get_runtime (vm, dslite_out2in_node.index); + error_node = vlib_node_get_runtime (vm, dm->dslite_out2in_node_index); from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; @@ -270,7 +268,6 @@ dslite_out2in_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dslite_out2in_node) = { - .function = dslite_out2in_node_fn, .name = "dslite-out2in", .vector_size = sizeof (u32), .format_trace = format_dslite_trace, @@ -287,8 +284,6 @@ VLIB_REGISTER_NODE (dslite_out2in_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (dslite_out2in_node, dslite_out2in_node_fn); - /* * fd.io coding-style-patch-verification: ON * -- cgit 1.2.3-korg