Add VLIB_NODE_FN() macro to simplify multiversioning of node functions

[vpp.git] / src / plugins / memif / device.c

diff --git a/src/plugins/memif/device.c b/src/plugins/memif/device.c
index 6accad6..14b9d54 100644 (file)
--- a/src/plugins/memif/device.c
+++ b/src/plugins/memif/device.c
@@ -46,7 +46,7 @@ static __clib_unused char *memif_tx_func_error_strings[] = {
 #undef _
 };
 
-#ifndef CLIB_MULTIARCH_VARIANT
+#ifndef CLIB_MARCH_VARIANT
 u8 *
 format_memif_device_name (u8 * s, va_list * args)
 {
@@ -311,7 +311,8 @@ retry:
   n_free = ring->tail - mq->last_tail;
   if (n_free >= 16)
     {
-      vlib_buffer_free_from_ring_no_next (vm, mq->buffers, mq->last_tail,
+      vlib_buffer_free_from_ring_no_next (vm, mq->buffers,
+                                         mq->last_tail & mask,
                                          ring_size, n_free);
       mq->last_tail += n_free;
     }
@@ -499,7 +500,7 @@ memif_subif_add_del_function (vnet_main_t * vnm,
   return 0;
 }
 
-#ifndef CLIB_MULTIARCH_VARIANT
+#ifndef CLIB_MARCH_VARIANT
 /* *INDENT-OFF* */
 VNET_DEVICE_CLASS (memif_device_class) = {
   .name = "memif",