3 files changed, 15 insertions, 21 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* */
 
 /*
diff --git a/src/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c
index b14bff43c06..47407aaaa26 100644
--- a/src/vnet/devices/netmap/device.c
+++ b/src/vnet/devices/netmap/device.c
@@ -93,9 +93,9 @@ format_netmap_tx_trace (u8 * s, va_list * args)
   return s;
 }
 
-static uword
-netmap_interface_tx (vlib_main_t * vm,
-		     vlib_node_runtime_t * node, vlib_frame_t * frame)
+VNET_DEVICE_CLASS_TX_FN (netmap_device_class) (vlib_main_t * vm,
+					       vlib_node_runtime_t * node,
+					       vlib_frame_t * frame)
 {
   netmap_main_t *nm = &netmap_main;
   u32 *buffers = vlib_frame_vector_args (frame);
@@ -231,7 +231,6 @@ netmap_subif_add_del_function (vnet_main_t * vnm,
 /* *INDENT-OFF* */
 VNET_DEVICE_CLASS (netmap_device_class) = {
   .name = "netmap",
-  .tx_function = netmap_interface_tx,
   .format_device_name = format_netmap_device_name,
   .format_device = format_netmap_device,
   .format_tx_trace = format_netmap_tx_trace,
@@ -242,9 +241,6 @@ VNET_DEVICE_CLASS (netmap_device_class) = {
   .admin_up_down_function = netmap_interface_admin_up_down,
   .subif_add_del_function = netmap_subif_add_del_function,
 };
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH(netmap_device_class,
-				  netmap_interface_tx)
 /* *INDENT-ON* */
 
 /*
diff --git a/src/vnet/devices/virtio/device.c b/src/vnet/devices/virtio/device.c
index 609ffb47de8..dbf560688b8 100644
--- a/src/vnet/devices/virtio/device.c
+++ b/src/vnet/devices/virtio/device.c
@@ -46,6 +46,7 @@ static char *virtio_tx_func_error_strings[] = {
 #undef _
 };
 
+#ifndef CLIB_MARCH_VARIANT
 u8 *
 format_virtio_device_name (u8 * s, va_list * args)
 {
@@ -64,6 +65,7 @@ format_virtio_device_name (u8 * s, va_list * args)
 
   return s;
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 static u8 *
 format_virtio_device (u8 * s, va_list * args)
@@ -88,6 +90,7 @@ format_virtio_tx_trace (u8 * s, va_list * args)
   return s;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 inline void
 virtio_free_used_desc (vlib_main_t * vm, virtio_vring_t * vring)
 {
@@ -113,6 +116,7 @@ virtio_free_used_desc (vlib_main_t * vm, virtio_vring_t * vring)
   vring->desc_in_use = used;
   vring->last_used_idx = last;
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 static_always_inline u16
 add_buffer_to_slot (vlib_main_t * vm, virtio_if_t * vif,
@@ -299,9 +303,9 @@ virtio_interface_tx_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
   return frame->n_vectors - n_left;
 }
 
-static uword
-virtio_interface_tx (vlib_main_t * vm,
-		     vlib_node_runtime_t * node, vlib_frame_t * frame)
+VNET_DEVICE_CLASS_TX_FN (virtio_device_class) (vlib_main_t * vm,
+					       vlib_node_runtime_t * node,
+					       vlib_frame_t * frame)
 {
   virtio_main_t *nm = &virtio_main;
   vnet_interface_output_runtime_t *rund = (void *) node->runtime_data;
@@ -391,7 +395,6 @@ virtio_subif_add_del_function (vnet_main_t * vnm,
 /* *INDENT-OFF* */
 VNET_DEVICE_CLASS (virtio_device_class) = {
   .name = "virtio",
-  .tx_function = virtio_interface_tx,
   .format_device_name = format_virtio_device_name,
   .format_device = format_virtio_device,
   .format_tx_trace = format_virtio_tx_trace,
@@ -403,9 +406,6 @@ VNET_DEVICE_CLASS (virtio_device_class) = {
   .subif_add_del_function = virtio_subif_add_del_function,
   .rx_mode_change_function = virtio_interface_rx_mode_change,
 };
-
-VLIB_DEVICE_TX_FUNCTION_MULTIARCH(virtio_device_class,
-				  virtio_interface_tx)
 /* *INDENT-ON* */
 
 /*