diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-10-29 13:38:19 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-10-29 15:03:34 +0000 |
| commit | b8f354470628e464452c062ca0802f59f8e572f3 (patch) | |
| tree | ced1941d441492d1c24c208a62e93bf60a83d0c8 /src/plugins | |
| parent | cd35e53c928f666e50342e27d69e6dd7d60e1283 (diff) | |
migrate ipsec to new multiarch infra
Change-Id: Ibef46e068cd72415af28920b0146adf48105bf68
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/dpdk/ipsec/esp_decrypt.c | 22 | ||||
| -rw-r--r-- | src/plugins/dpdk/ipsec/esp_encrypt.c | 19 |
2 files changed, 10 insertions, 31 deletions
diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c index 9cf9c762ada..9d88f072f9f 100644 --- a/src/plugins/dpdk/ipsec/esp_decrypt.c +++ b/src/plugins/dpdk/ipsec/esp_decrypt.c @@ -379,8 +379,7 @@ trace: return from_frame->n_vectors; } -static uword -dpdk_esp4_decrypt_node_fn (vlib_main_t * vm, +VLIB_NODE_FN(dpdk_esp4_decrypt_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { @@ -389,7 +388,6 @@ dpdk_esp4_decrypt_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_esp4_decrypt_node) = { - .function = dpdk_esp4_decrypt_node_fn, .name = "dpdk-esp4-decrypt", .vector_size = sizeof (u32), .format_trace = format_esp_decrypt_trace, @@ -407,10 +405,7 @@ VLIB_REGISTER_NODE (dpdk_esp4_decrypt_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp4_decrypt_node, dpdk_esp4_decrypt_node_fn); - -static uword -dpdk_esp6_decrypt_node_fn (vlib_main_t * vm, +VLIB_NODE_FN(dpdk_esp6_decrypt_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { @@ -419,7 +414,6 @@ dpdk_esp6_decrypt_node_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_REGISTER_NODE (dpdk_esp6_decrypt_node) = { - .function = dpdk_esp6_decrypt_node_fn, .name = "dpdk-esp6-decrypt", .vector_size = sizeof (u32), .format_trace = format_esp_decrypt_trace, @@ -437,8 +431,6 @@ VLIB_REGISTER_NODE (dpdk_esp6_decrypt_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp6_decrypt_node, dpdk_esp6_decrypt_node_fn); - /* * Decrypt Post Node */ @@ -676,8 +668,7 @@ dpdk_esp_decrypt_post_inline (vlib_main_t * vm, return from_frame->n_vectors; } -static uword -dpdk_esp4_decrypt_post_node_fn (vlib_main_t * vm, +VLIB_NODE_FN(dpdk_esp4_decrypt_post_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) {return dpdk_esp_decrypt_post_inline(vm, node, from_frame, 0/*is_ip6*/);} @@ -702,10 +693,7 @@ VLIB_REGISTER_NODE (dpdk_esp4_decrypt_post_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp4_decrypt_post_node, dpdk_esp4_decrypt_post_node_fn); - -static uword -dpdk_esp6_decrypt_post_node_fn (vlib_main_t * vm, +VLIB_NODE_FN(dpdk_esp6_decrypt_post_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) {return dpdk_esp_decrypt_post_inline(vm, node, from_frame, 0/*is_ip6*/);} @@ -729,5 +717,3 @@ VLIB_REGISTER_NODE (dpdk_esp6_decrypt_post_node) = { }, }; /* *INDENT-ON* */ - -VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp6_decrypt_post_node, dpdk_esp6_decrypt_post_node_fn); diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c index af8cc46b946..ded569f9d3d 100644 --- a/src/plugins/dpdk/ipsec/esp_encrypt.c +++ b/src/plugins/dpdk/ipsec/esp_encrypt.c @@ -567,10 +567,9 @@ dpdk_esp_encrypt_inline (vlib_main_t * vm, return from_frame->n_vectors; } -static uword -dpdk_esp4_encrypt_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (dpdk_esp4_encrypt_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return dpdk_esp_encrypt_inline (vm, node, from_frame, 0 /*is_ip6 */ ); } @@ -592,13 +591,9 @@ VLIB_REGISTER_NODE (dpdk_esp4_encrypt_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp4_encrypt_node, - dpdk_esp4_encrypt_node_fn); - -static uword -dpdk_esp6_encrypt_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * from_frame) +VLIB_NODE_FN (dpdk_esp6_encrypt_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return dpdk_esp_encrypt_inline (vm, node, from_frame, 1 /*is_ip6 */ ); } @@ -620,8 +615,6 @@ VLIB_REGISTER_NODE (dpdk_esp6_encrypt_node) = { }; /* *INDENT-ON* */ -VLIB_NODE_FUNCTION_MULTIARCH (dpdk_esp6_encrypt_node, - dpdk_esp6_encrypt_node_fn); /* * fd.io coding-style-patch-verification: ON * |