From 057b3565a09b62c9415a44a99f43ad891d864ca5 Mon Sep 17 00:00:00 2001 From: Pierre Pfister Date: Mon, 10 Dec 2018 17:01:01 +0100 Subject: Change ipsec feature node names ipsec4-output and ipsec6-output were conflicting with ipsec interface names ("ipsec") and vnet/interface.c autogenerated output node ("-output"). Changing feature names seems to be the less invasive option. This patch also changes "input" feature names for consistency. Change-Id: I4ba10d07e9ba09df20aa2500104252b06b55f8f7 Signed-off-by: Pierre Pfister --- src/vnet/ipsec/ipsec_input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/vnet/ipsec/ipsec_input.c') diff --git a/src/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c index ef4113a1c09..1f3d6d01a93 100644 --- a/src/vnet/ipsec/ipsec_input.c +++ b/src/vnet/ipsec/ipsec_input.c @@ -335,7 +335,7 @@ VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipsec4_input_node,static) = { - .name = "ipsec4-input", + .name = "ipsec4-input-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_input_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -482,7 +482,7 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ipsec6_input_node,static) = { - .name = "ipsec6-input", + .name = "ipsec6-input-feature", .vector_size = sizeof (u32), .format_trace = format_ipsec_input_trace, .type = VLIB_NODE_TYPE_INTERNAL, @@ -490,7 +490,7 @@ VLIB_REGISTER_NODE (ipsec6_input_node,static) = { .n_errors = ARRAY_LEN(ipsec_input_error_strings), .error_strings = ipsec_input_error_strings, - .sibling_of = "ipsec4-input", + .sibling_of = "ipsec4-input-feature", }; /* *INDENT-ON* */ -- cgit 1.2.3-korg