diff options
| author |   Filip Varga <fivarga@cisco.com> | 2019-02-13 01:42:59 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-18 16:46:50 +0000 |
| commit | e69e423743630b52e13db58c3f0229df8a46c07f (patch) | |
| tree | 5471b64b7fe38031f47791c987f9791fc8207fa7 /src/plugins/nat/nat44_handoff.c | |
| parent | 7dcb80a202f1ce075434a17ace3334a7a311e84e (diff) | |
NAT: VPP-1552 code migration from old multiarch scheme
Change-Id: I88f3df8aaa521e7707ef3335acdbf1ab41e7ee28
Signed-off-by: Filip Varga <fivarga@cisco.com>
Diffstat (limited to 'src/plugins/nat/nat44_handoff.c')
| -rw-r--r-- | src/plugins/nat/nat44_handoff.c | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/src/plugins/nat/nat44_handoff.c b/src/plugins/nat/nat44_handoff.c index d7ab650a665..2a8404d141f 100644 --- a/src/plugins/nat/nat44_handoff.c +++ b/src/plugins/nat/nat44_handoff.c @@ -50,10 +50,6 @@ static char *nat44_handoff_error_strings[] = { }; -vlib_node_registration_t snat_in2out_worker_handoff_node; -vlib_node_registration_t snat_in2out_output_worker_handoff_node; -vlib_node_registration_t snat_out2in_worker_handoff_node; - static u8 * format_nat44_handoff_trace (u8 * s, va_list * args) { @@ -152,17 +148,15 @@ nat44_worker_handoff_fn_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } -static uword -snat_in2out_worker_handoff_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (snat_in2out_worker_handoff_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_worker_handoff_fn_inline (vm, node, frame, 0, 1); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (snat_in2out_worker_handoff_node) = { - .function = snat_in2out_worker_handoff_fn, .name = "nat44-in2out-worker-handoff", .vector_size = sizeof (u32), .format_trace = format_nat44_handoff_trace, @@ -176,20 +170,16 @@ VLIB_REGISTER_NODE (snat_in2out_worker_handoff_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_worker_handoff_node, - snat_in2out_worker_handoff_fn); - -static uword -snat_in2out_output_worker_handoff_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (snat_in2out_output_worker_handoff_node) (vlib_main_t * vm, + vlib_node_runtime_t * + node, + vlib_frame_t * frame) { return nat44_worker_handoff_fn_inline (vm, node, frame, 1, 1); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (snat_in2out_output_worker_handoff_node) = { - .function = snat_in2out_output_worker_handoff_fn, .name = "nat44-in2out-output-worker-handoff", .vector_size = sizeof (u32), .format_trace = format_nat44_handoff_trace, @@ -203,20 +193,15 @@ VLIB_REGISTER_NODE (snat_in2out_output_worker_handoff_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_output_worker_handoff_node, - snat_in2out_output_worker_handoff_fn); - -static uword -snat_out2in_worker_handoff_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (snat_out2in_worker_handoff_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return nat44_worker_handoff_fn_inline (vm, node, frame, 0, 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (snat_out2in_worker_handoff_node) = { - .function = snat_out2in_worker_handoff_fn, .name = "nat44-out2in-worker-handoff", .vector_size = sizeof (u32), .format_trace = format_nat44_handoff_trace, @@ -230,9 +215,6 @@ VLIB_REGISTER_NODE (snat_out2in_worker_handoff_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_worker_handoff_node, - snat_out2in_worker_handoff_fn); - /* * fd.io coding-style-patch-verification: ON * |