From e8cb521074582fc4a27f21717691750063b73ef5 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Wed, 6 Mar 2019 04:50:34 -0800 Subject: classify: migrate old MULTIARCH macros to VLIB_NODE_FN Change-Id: I01730ec9eb8033074c8710daf0848c3573293aeb Signed-off-by: Filip Tehlar --- src/vnet/classify/flow_classify_node.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/vnet/classify/flow_classify_node.c') diff --git a/src/vnet/classify/flow_classify_node.c b/src/vnet/classify/flow_classify_node.c index 5941b6dd9b3..865281ec032 100644 --- a/src/vnet/classify/flow_classify_node.c +++ b/src/vnet/classify/flow_classify_node.c @@ -275,16 +275,15 @@ flow_classify_inline (vlib_main_t * vm, return frame->n_vectors; } -static uword -ip4_flow_classify (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (ip4_flow_classify_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return flow_classify_inline (vm, node, frame, FLOW_CLASSIFY_TABLE_IP4); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip4_flow_classify_node) = { - .function = ip4_flow_classify, .name = "ip4-flow-classify", .vector_size = sizeof (u32), .format_trace = format_flow_classify_trace, @@ -297,18 +296,15 @@ VLIB_REGISTER_NODE (ip4_flow_classify_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (ip4_flow_classify_node, ip4_flow_classify); - -static uword -ip6_flow_classify (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (ip6_flow_classify_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return flow_classify_inline (vm, node, frame, FLOW_CLASSIFY_TABLE_IP6); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip6_flow_classify_node) = { - .function = ip6_flow_classify, .name = "ip6-flow-classify", .vector_size = sizeof (u32), .format_trace = format_flow_classify_trace, @@ -322,8 +318,6 @@ VLIB_REGISTER_NODE (ip6_flow_classify_node) = { /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (ip6_flow_classify_node, ip6_flow_classify); - static clib_error_t * flow_classify_init (vlib_main_t * vm) -- cgit 1.2.3-korg