summaryrefslogtreecommitdiffstats
path: root/src/vnet/devices/af_packet
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/devices/af_packet
parent69becfcd5eaab90c99b63ca7f3de7ccad9fffc0a (diff)
deprecate VLIB_DEVICE_TX_FUNCTION_MULTIARCH
Change-Id: I8819bcb9e228e7a432f4a7b67b6107f984927cd4 Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'src/vnet/devices/af_packet')
-rw-r--r--src/vnet/devices/af_packet/device.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/vnet/devices/af_packet/device.c b/src/vnet/devices/af_packet/device.c
index 9d08c620d94..2886fb5b6d5 100644
--- a/src/vnet/devices/af_packet/device.c
+++ b/src/vnet/devices/af_packet/device.c
@@ -51,6 +51,7 @@ static char *af_packet_tx_func_error_strings[] = {
};
+#ifndef CLIB_MARCH_VARIANT
u8 *
format_af_packet_device_name (u8 * s, va_list * args)
{
@@ -61,6 +62,7 @@ format_af_packet_device_name (u8 * s, va_list * args)
s = format (s, "host-%s", apif->host_if_name);
return s;
}
+#endif /* CLIB_MARCH_VARIANT */
static u8 *
format_af_packet_device (u8 * s, va_list * args)
@@ -76,9 +78,9 @@ format_af_packet_tx_trace (u8 * s, va_list * args)
return s;
}
-static uword
-af_packet_interface_tx (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+VNET_DEVICE_CLASS_TX_FN (af_packet_device_class) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
af_packet_main_t *apm = &af_packet_main;
u32 *buffers = vlib_frame_vector_args (frame);
@@ -330,7 +332,6 @@ error:
/* *INDENT-OFF* */
VNET_DEVICE_CLASS (af_packet_device_class) = {
.name = "af-packet",
- .tx_function = af_packet_interface_tx,
.format_device_name = format_af_packet_device_name,
.format_device = format_af_packet_device,
.format_tx_trace = format_af_packet_tx_trace,
@@ -342,9 +343,6 @@ VNET_DEVICE_CLASS (af_packet_device_class) = {
.subif_add_del_function = af_packet_subif_add_del_function,
.mac_addr_change_function = af_packet_set_mac_address_function,
};
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH (af_packet_device_class,
- af_packet_interface_tx)
/* *INDENT-ON* */
/*