interface: shorten vnet_hw_if_rx_mode

This is part of bigger refactor.

Type: refactor
Change-Id: I6fc2c0a1e2d217a70952901bcf775b8485bd3c20
Signed-off-by: Damjan Marion <damarion@cisco.com>

5 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c
index 32df1dfcb79..eab8106c4a8 100644
--- a/src/plugins/avf/device.c
+++ b/src/plugins/avf/device.c
@@ -1654,13 +1654,13 @@ avf_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
 
 static clib_error_t *
 avf_interface_rx_mode_change (vnet_main_t * vnm, u32 hw_if_index, u32 qid,
-			      vnet_hw_interface_rx_mode mode)
+			      vnet_hw_if_rx_mode mode)
 {
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
   avf_device_t *ad = avf_get_device (hw->dev_instance);
   avf_rxq_t *rxq = vec_elt_at_index (ad->rxqs, qid);
 
-  if (mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
+  if (mode == VNET_HW_IF_RX_MODE_POLLING)
     {
       if (rxq->int_mode == 0)
 	return 0;
diff --git a/src/plugins/marvell/pp2/pp2.c b/src/plugins/marvell/pp2/pp2.c
index 36b191a178b..fdd0e85035d 100644
--- a/src/plugins/marvell/pp2/pp2.c
+++ b/src/plugins/marvell/pp2/pp2.c
@@ -305,7 +305,7 @@ mrvl_pp2_create_if (mrvl_pp2_create_if_args_t * args)
 				    mrvl_pp2_input_node.index);
   vnet_hw_interface_assign_rx_thread (vnm, ppif->hw_if_index, 0, ~0);
   vnet_hw_interface_set_rx_mode (vnm, ppif->hw_if_index, 0,
-				 VNET_HW_INTERFACE_RX_MODE_POLLING);
+				 VNET_HW_IF_RX_MODE_POLLING);
   vnet_hw_interface_set_flags (vnm, ppif->hw_if_index,
 			       VNET_HW_INTERFACE_FLAG_LINK_UP);
   goto done;
diff --git a/src/plugins/memif/device.c b/src/plugins/memif/device.c
index 28bf8259311..aa79f884eef 100644
--- a/src/plugins/memif/device.c
+++ b/src/plugins/memif/device.c
@@ -459,14 +459,14 @@ memif_clear_hw_interface_counters (u32 instance)
 
 static clib_error_t *
 memif_interface_rx_mode_change (vnet_main_t * vnm, u32 hw_if_index, u32 qid,
-				vnet_hw_interface_rx_mode mode)
+				vnet_hw_if_rx_mode mode)
 {
   memif_main_t *mm = &memif_main;
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
   memif_if_t *mif = pool_elt_at_index (mm->interfaces, hw->dev_instance);
   memif_queue_t *mq = vec_elt_at_index (mif->rx_queues, qid);
 
-  if (mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
+  if (mode == VNET_HW_IF_RX_MODE_POLLING)
     mq->ring->flags |= MEMIF_RING_FLAG_MASK_INT;
   else
     mq->ring->flags &= ~MEMIF_RING_FLAG_MASK_INT;
diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c
index c1bab0ba15f..3a2ed36c2dc 100644
--- a/src/plugins/memif/memif.c
+++ b/src/plugins/memif/memif.c
@@ -296,17 +296,17 @@ memif_connect (memif_if_t * mif)
       mq->buffer_pool_index =
 	vlib_buffer_pool_get_default_for_numa (vm, vlib_mains[ti]->numa_node);
       rv = vnet_hw_interface_set_rx_mode (vnm, mif->hw_if_index, i,
-					  VNET_HW_INTERFACE_RX_MODE_DEFAULT);
+					  VNET_HW_IF_RX_MODE_DEFAULT);
       if (rv)
 	memif_log_err
 	  (mif, "Warning: unable to set rx mode for interface %d queue %d: "
 	   "rc=%d", mif->hw_if_index, i, rv);
       else
 	{
-	  vnet_hw_interface_rx_mode rxmode;
+	  vnet_hw_if_rx_mode rxmode;
 	  vnet_hw_interface_get_rx_mode (vnm, mif->hw_if_index, i, &rxmode);
 
-	  if (rxmode == VNET_HW_INTERFACE_RX_MODE_POLLING)
+	  if (rxmode == VNET_HW_IF_RX_MODE_POLLING)
 	    mq->ring->flags |= MEMIF_RING_FLAG_MASK_INT;
 	  else
 	    vnet_device_input_set_interrupt_pending (vnm, mif->hw_if_index, i);
diff --git a/src/plugins/vmxnet3/vmxnet3.c b/src/plugins/vmxnet3/vmxnet3.c
index 9209c3e2f90..ec0ab2b6863 100644
--- a/src/plugins/vmxnet3/vmxnet3.c
+++ b/src/plugins/vmxnet3/vmxnet3.c
@@ -62,14 +62,14 @@ vmxnet3_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index,
 
 static clib_error_t *
 vmxnet3_interface_rx_mode_change (vnet_main_t * vnm, u32 hw_if_index, u32 qid,
-				  vnet_hw_interface_rx_mode mode)
+				  vnet_hw_if_rx_mode mode)
 {
   vmxnet3_main_t *vmxm = &vmxnet3_main;
   vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index);
   vmxnet3_device_t *vd = pool_elt_at_index (vmxm->devices, hw->dev_instance);
   vmxnet3_rxq_t *rxq = vec_elt_at_index (vd->rxqs, qid);
 
-  if (mode == VNET_HW_INTERFACE_RX_MODE_POLLING)
+  if (mode == VNET_HW_IF_RX_MODE_POLLING)
     rxq->int_mode = 0;
   else
     rxq->int_mode = 1;