aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/ipsec-gre
diff options
context:
space:
mode:
authorFilip Tehlar <ftehlar@cisco.com>2019-03-13 05:50:44 -0700
committerFilip Tehlar <ftehlar@cisco.com>2019-03-13 05:50:59 -0700
commitaee73648cf524f2627a8680ca26a68d6a2c8e164 (patch)
treee2ad1f18593a6a606924b1735bb7200662d5eb3a /src/vnet/ipsec-gre
parent69becfcd5eaab90c99b63ca7f3de7ccad9fffc0a (diff)
deprecate VLIB_DEVICE_TX_FUNCTION_MULTIARCH
Change-Id: I8819bcb9e228e7a432f4a7b67b6107f984927cd4 Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/ipsec-gre')
-rw-r--r--src/vnet/ipsec-gre/ipsec_gre.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/vnet/ipsec-gre/ipsec_gre.c b/src/vnet/ipsec-gre/ipsec_gre.c
index 1b6fcf3ef63..e4f5e805289 100644
--- a/src/vnet/ipsec-gre/ipsec_gre.c
+++ b/src/vnet/ipsec-gre/ipsec_gre.c
@@ -22,7 +22,11 @@
#include <vnet/vnet.h>
#include <vnet/ipsec-gre/ipsec_gre.h>
+extern ipsec_gre_main_t ipsec_gre_main;
+
+#ifndef CLIB_MARCH_VARIANT
ipsec_gre_main_t ipsec_gre_main;
+#endif /* CLIB_MARCH_VARIANT */
/**
* @brief IPv4 and GRE header union.
@@ -53,7 +57,7 @@ typedef struct
u32 sa_id; /**< tunnel IPSec SA id */
} ipsec_gre_tx_trace_t;
-u8 *
+static u8 *
format_ipsec_gre_tx_trace (u8 * s, va_list * args)
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
@@ -92,9 +96,9 @@ format_ipsec_gre_tx_trace (u8 * s, va_list * args)
* <em>Next Index:</em>
* - Dispatches the packet to the esp-encrypt node.
*/
-static uword
-ipsec_gre_interface_tx (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+VNET_DEVICE_CLASS_TX_FN (ipsec_gre_device_class) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
ipsec_gre_main_t *igm = &ipsec_gre_main;
u32 next_index;
@@ -348,17 +352,15 @@ VNET_DEVICE_CLASS (ipsec_gre_device_class) = {
.format_device_name = format_ipsec_gre_tunnel_name,
.format_device = format_ipsec_gre_device,
.format_tx_trace = format_ipsec_gre_tx_trace,
- .tx_function = ipsec_gre_interface_tx,
.admin_up_down_function = ipsec_gre_interface_admin_up_down,
};
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (ipsec_gre_device_class,
- ipsec_gre_interface_tx)
-
+#ifndef CLIB_MARCH_VARIANT
VNET_HW_INTERFACE_CLASS (ipsec_gre_hw_interface_class) = {
.name = "IPSEC-GRE",
};
+#endif /* CLIB_MARCH_VARIANT */
/* *INDENT-ON* */
static clib_error_t *