nat: use correct data types for memory sizes

[vpp.git] / src / plugins / vmxnet3 / output.c

diff --git a/src/plugins/vmxnet3/output.c b/src/plugins/vmxnet3/output.c
index 2a6418d..81a1afb 100644 (file)
--- a/src/plugins/vmxnet3/output.c
+++ b/src/plugins/vmxnet3/output.c
@@ -108,8 +108,7 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
   u16 space_left;
   u16 n_left = frame->n_vectors;
   vmxnet3_txq_t *txq;
-  u32 thread_index = vm->thread_index;
-  u16 qid = thread_index, produce;
+  u16 qid = vm->thread_index % vd->num_tx_queues, produce;
 
   if (PREDICT_FALSE (!(vd->flags & VMXNET3_DEVICE_F_LINK_UP)))
     {
@@ -119,7 +118,7 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
       return (0);
     }
 
-  txq = vec_elt_at_index (vd->txqs, qid % vd->num_tx_queues);
+  txq = vec_elt_at_index (vd->txqs, qid);
   clib_spinlock_lock_if_init (&txq->lock);
 
   vmxnet3_txq_release (vm, vd, txq);
@@ -128,7 +127,9 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
   while (PREDICT_TRUE (n_left))
     {
       u16 space_needed = 1, i;
+      u32 gso_size = 0;
       vlib_buffer_t *b;
+      u32 hdr_len = 0;
 
       bi0 = buffers[0];
       b0 = vlib_get_buffer (vm, bi0);
@@ -179,17 +180,33 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
          txq->tx_ring.bufs[desc_idx] = bi0;
 
          txd = &txq->tx_desc[desc_idx];
+
          txd->address = vlib_buffer_get_current_pa (vm, b0);
 
          txd->flags[0] = generation | b0->current_length;
+         txd->flags[1] = 0;
+         if (PREDICT_FALSE (b0->flags & VNET_BUFFER_F_GSO))
+           {
+             /*
+              * We should not be getting GSO outbound traffic unless it is
+              * lro is enable
+              */
+             ASSERT (vd->gso_enable == 1);
+             gso_size = vnet_buffer2 (b0)->gso_size;
+             hdr_len = vnet_buffer (b0)->l4_hdr_offset +
+               sizeof (ethernet_header_t);
+           }
 
          generation = txq->tx_ring.gen;
-
-         txd->flags[1] = 0;
          bi0 = b0->next_buffer;
        }
-
-      txd->flags[1] = VMXNET3_TXF_CQ | VMXNET3_TXF_EOP;
+      if (PREDICT_FALSE (gso_size != 0))
+       {
+         txd->flags[1] = hdr_len;
+         txd->flags[1] |= VMXNET3_TXF_OM (VMXNET3_OM_TSO);
+         txd->flags[0] |= VMXNET3_TXF_MSSCOF (gso_size);
+       }
+      txd->flags[1] |= VMXNET3_TXF_CQ | VMXNET3_TXF_EOP;
       asm volatile ("":::"memory");
       /*
        * Now toggle back the generation bit for the first segment.
@@ -202,8 +219,7 @@ VNET_DEVICE_CLASS_TX_FN (vmxnet3_device_class) (vlib_main_t * vm,
     }
 
   if (PREDICT_TRUE (produce != txq->tx_ring.produce))
-    vmxnet3_reg_write_inline (vd, 0, VMXNET3_REG_TXPROD,
-                             txq->tx_ring.produce);
+    vmxnet3_reg_write_inline (vd, 0, txq->reg_txprod, txq->tx_ring.produce);
 
   clib_spinlock_unlock_if_init (&txq->lock);