diff options
| author |   Filip Tehlar <ftehlar@cisco.com> | 2019-02-28 02:51:47 -0800 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2019-03-04 07:49:25 +0000 |
| commit | 6fa5dac5fe9699c5eeed383c5bcb3f08507e1548 (patch) | |
| tree | e09cec5c32013f5d790a8d1cc036ed526a329498 /src/plugins/gbp/gbp_fwd_dpo.c | |
| parent | 6442401c21f880dbfd25d36859f79ddf54b49178 (diff) | |
gbp: migrate old MULTIARCH macros to VLIB_NODE_FN
Change-Id: I3b10caa447b796172f787df8fcbb92f2b4dd2803
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/plugins/gbp/gbp_fwd_dpo.c')
| -rw-r--r-- | src/plugins/gbp/gbp_fwd_dpo.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/plugins/gbp/gbp_fwd_dpo.c b/src/plugins/gbp/gbp_fwd_dpo.c index e3dba5fa527..c0b19a9e398 100644 --- a/src/plugins/gbp/gbp_fwd_dpo.c +++ b/src/plugins/gbp/gbp_fwd_dpo.c @@ -18,6 +18,8 @@ #include <vnet/ethernet/ethernet.h> + +#ifndef CLIB_MARCH_VARIANT /** * The 'DB' of GBP FWD DPOs. * There is one per-proto @@ -164,6 +166,7 @@ gbp_fwd_dpo_module_init (vlib_main_t * vm) } VLIB_INIT_FUNCTION (gbp_fwd_dpo_module_init); +#endif /* CLIB_MARCH_VARIANT */ typedef struct gbp_fwd_dpo_trace_t_ { @@ -255,23 +258,22 @@ format_gbp_fwd_dpo_trace (u8 * s, va_list * args) return s; } -static uword -ip4_gbp_fwd_dpo (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * from_frame) +VLIB_NODE_FN (ip4_gbp_fwd_dpo_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return (gbp_fwd_dpo_inline (vm, node, from_frame, FIB_PROTOCOL_IP4)); } -static uword -ip6_gbp_fwd_dpo (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * from_frame) +VLIB_NODE_FN (ip6_gbp_fwd_dpo_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return (gbp_fwd_dpo_inline (vm, node, from_frame, FIB_PROTOCOL_IP6)); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip4_gbp_fwd_dpo_node) = { - .function = ip4_gbp_fwd_dpo, .name = "ip4-gbp-fwd-dpo", .vector_size = sizeof (u32), .format_trace = format_gbp_fwd_dpo_trace, @@ -283,7 +285,6 @@ VLIB_REGISTER_NODE (ip4_gbp_fwd_dpo_node) = { } }; VLIB_REGISTER_NODE (ip6_gbp_fwd_dpo_node) = { - .function = ip6_gbp_fwd_dpo, .name = "ip6-gbp-fwd-dpo", .vector_size = sizeof (u32), .format_trace = format_gbp_fwd_dpo_trace, @@ -294,9 +295,6 @@ VLIB_REGISTER_NODE (ip6_gbp_fwd_dpo_node) = { [GBP_FWD_FWD] = "ip6-dvr-dpo", } }; - -VLIB_NODE_FUNCTION_MULTIARCH (ip4_gbp_fwd_dpo_node, ip4_gbp_fwd_dpo) -VLIB_NODE_FUNCTION_MULTIARCH (ip6_gbp_fwd_dpo_node, ip6_gbp_fwd_dpo) /* *INDENT-ON* */ /* |