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/nat66_in2out.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/nat66_in2out.c')
| -rw-r--r-- | src/plugins/nat/nat66_in2out.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/nat/nat66_in2out.c b/src/plugins/nat/nat66_in2out.c index 6bcf6ec667c..ac1f3298415 100644 --- a/src/plugins/nat/nat66_in2out.c +++ b/src/plugins/nat/nat66_in2out.c @@ -41,8 +41,6 @@ format_nat66_in2out_trace (u8 * s, va_list * args) return s; } -vlib_node_registration_t nat66_in2out_node; - #define foreach_nat66_in2out_error \ _(IN2OUT_PACKETS, "good in2out packets processed") \ _(NO_TRANSLATION, "no translation") \ @@ -109,9 +107,9 @@ nat66_not_translate (u32 rx_fib_index, ip6_address_t ip6_addr) return 1; } -static inline uword -nat66_in2out_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (nat66_in2out_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { u32 n_left_from, *from, *to_next; nat66_in2out_next_t next_index; @@ -232,7 +230,7 @@ nat66_in2out_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, nat66_in2out_node.index, + vlib_node_increment_counter (vm, nm->in2out_node_index, NAT66_IN2OUT_ERROR_IN2OUT_PACKETS, pkts_processed); return frame->n_vectors; @@ -240,7 +238,6 @@ nat66_in2out_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (nat66_in2out_node) = { - .function = nat66_in2out_node_fn, .name = "nat66-in2out", .vector_size = sizeof (u32), .format_trace = format_nat66_in2out_trace, @@ -256,8 +253,6 @@ VLIB_REGISTER_NODE (nat66_in2out_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (nat66_in2out_node, nat66_in2out_node_fn); - /* * fd.io coding-style-patch-verification: ON * |