From 8340c69ad4c8ca4002a382fbf192f447e73d964d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 22 Jan 2019 16:07:27 +0100 Subject: [PATCH] gbp: fix inlining issue Change-Id: Idbbe5996a5749733a904433b57cba7ab63fdbbcb Signed-off-by: Damjan Marion --- src/plugins/gbp/gbp_sclass.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/gbp/gbp_sclass.c b/src/plugins/gbp/gbp_sclass.c index 10ecf1fa42e..e25ea38de01 100644 --- a/src/plugins/gbp/gbp_sclass.c +++ b/src/plugins/gbp/gbp_sclass.c @@ -50,7 +50,7 @@ typedef struct gbp_sclass_trace_t_ u32 sclass; } gbp_sclass_trace_t; -always_inline uword +static_always_inline uword gbp_sclass_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame, int is_id_2_sclass, int is_l2) @@ -146,42 +146,42 @@ gbp_sclass_inline (vlib_main_t * vm, return frame->n_vectors; } -always_inline uword +uword l2_gbp_id_2_sclass (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return (gbp_sclass_inline (vm, node, frame, 1, 1)); } -always_inline uword +uword l2_gbp_sclass_2_id (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return (gbp_sclass_inline (vm, node, frame, 0, 1)); } -always_inline uword +uword ip4_gbp_id_2_sclass (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return (gbp_sclass_inline (vm, node, frame, 1, 0)); } -always_inline uword +uword ip4_gbp_sclass_2_id (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return (gbp_sclass_inline (vm, node, frame, 0, 0)); } -always_inline uword +uword ip6_gbp_id_2_sclass (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return (gbp_sclass_inline (vm, node, frame, 1, 0)); } -always_inline uword +uword ip6_gbp_sclass_2_id (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { -- 2.16.6