From 17fcd989f417555b1c2edfe626add5cc6f620812 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Tue, 5 Mar 2019 04:32:11 -0800 Subject: mpls: migrate old MULTIARCH macros to VLIB_NODE_FN Change-Id: I8c5f7cda655e3343d50a96d714796ea4255588b6 Signed-off-by: Filip Tehlar --- src/vnet/mpls/mpls_features.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/vnet/mpls/mpls_features.c') diff --git a/src/vnet/mpls/mpls_features.c b/src/vnet/mpls/mpls_features.c index 9ed56dff554..5f07833b6a3 100644 --- a/src/vnet/mpls/mpls_features.c +++ b/src/vnet/mpls/mpls_features.c @@ -37,8 +37,7 @@ mpls_terminate (vlib_main_t * vm, return n_packets; } -static uword -mpls_punt (vlib_main_t * vm, +VLIB_NODE_FN (mpls_punt_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { @@ -46,7 +45,6 @@ mpls_punt (vlib_main_t * vm, } VLIB_REGISTER_NODE (mpls_punt_node) = { - .function = mpls_punt, .name = "mpls-punt", .vector_size = sizeof (u32), @@ -56,10 +54,7 @@ VLIB_REGISTER_NODE (mpls_punt_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (mpls_punt_node, mpls_punt) - -static uword -mpls_drop (vlib_main_t * vm, +VLIB_NODE_FN (mpls_drop_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { @@ -67,7 +62,6 @@ mpls_drop (vlib_main_t * vm, } VLIB_REGISTER_NODE (mpls_drop_node) = { - .function = mpls_drop, .name = "mpls-drop", .vector_size = sizeof (u32), @@ -77,10 +71,7 @@ VLIB_REGISTER_NODE (mpls_drop_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (mpls_drop_node, mpls_drop) - -static uword -mpls_not_enabled (vlib_main_t * vm, +VLIB_NODE_FN (mpls_not_enabled_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { @@ -88,7 +79,6 @@ mpls_not_enabled (vlib_main_t * vm, } VLIB_REGISTER_NODE (mpls_not_enabled_node) = { - .function = mpls_not_enabled, .name = "mpls-not-enabled", .vector_size = sizeof (u32), @@ -98,8 +88,6 @@ VLIB_REGISTER_NODE (mpls_not_enabled_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (mpls_not_enabled_node, mpls_not_enabled) - VNET_FEATURE_ARC_INIT (mpls_input, static) = { .arc_name = "mpls-input", -- cgit 1.2.3-korg