diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2019-03-01 03:18:58 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-01 20:26:13 +0000 |
| commit | b89609428977fe4ffae4e0823e28942fd4ac4ee8 (patch) | |
| tree | 94b805c74df51ccccb91d25a193ff53d9e9da7b5 /src/plugins/ioam/ip6/ioam_cache_node.c | |
| parent | 01f5c90259766708c66ed1548398fd52ebbfadb0 (diff) | |
ioam: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: Icb919a053b35ef62f958c60c725d3aae4c32358f
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/plugins/ioam/ip6/ioam_cache_node.c')
| -rw-r--r-- | src/plugins/ioam/ip6/ioam_cache_node.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/ioam/ip6/ioam_cache_node.c b/src/plugins/ioam/ip6/ioam_cache_node.c index 59bc1a64811..018077f3934 100644 --- a/src/plugins/ioam/ip6/ioam_cache_node.c +++ b/src/plugins/ioam/ip6/ioam_cache_node.c @@ -217,8 +217,6 @@ format_ip6_add_from_cache_hbh_trace (u8 * s, va_list * args) return s; } -vlib_node_registration_t ip6_add_from_cache_hbh_node; - #define foreach_ip6_add_from_cache_hbh_error \ _(PROCESSED, "Pkts w/ added ip6 hop-by-hop options") @@ -249,10 +247,9 @@ typedef enum } ip6_ioam_cache_input_next_t; -static uword -ip6_add_from_cache_hbh_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame) +VLIB_NODE_FN (ip6_add_from_cache_hbh_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { ioam_cache_main_t *cm = &ioam_cache_main; u32 n_left_from, *from, *to_next; @@ -384,7 +381,7 @@ ip6_add_from_cache_hbh_node_fn (vlib_main_t * vm, vlib_put_next_frame (vm, node, next_index, n_left_to_next); } - vlib_node_increment_counter (vm, ip6_add_from_cache_hbh_node.index, + vlib_node_increment_counter (vm, cm->ip6_add_from_cache_hbh_node_index, IP6_ADD_FROM_CACHE_HBH_ERROR_PROCESSED, processed); return frame->n_vectors; @@ -392,7 +389,6 @@ ip6_add_from_cache_hbh_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_add_from_cache_hbh_node) = { - .function = ip6_add_from_cache_hbh_node_fn, .name = "ip6-add-from-cache-hop-by-hop", .vector_size = sizeof (u32), .format_trace = format_ip6_add_from_cache_hbh_trace, @@ -410,8 +406,6 @@ VLIB_REGISTER_NODE (ip6_add_from_cache_hbh_node) = }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (ip6_add_from_cache_hbh_node, - ip6_add_from_cache_hbh_node_fn) /* * fd.io coding-style-patch-verification: ON * |