vmxnet3: gso fixes

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

diff --git a/src/plugins/vmxnet3/input.c b/src/plugins/vmxnet3/input.c
index 6d30f19..f182409 100644 (file)
--- a/src/plugins/vmxnet3/input.c
+++ b/src/plugins/vmxnet3/input.c
@@ -269,7 +269,6 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       b0->flags = 0;
       b0->error = 0;
       b0->current_config_index = 0;
-      ASSERT (b0->current_length != 0);
 
       if (PREDICT_FALSE ((rx_comp->index & VMXNET3_RXCI_EOP) &&
                         (rx_comp->len & VMXNET3_RXCL_ERROR)))
@@ -290,7 +289,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
        {
          ASSERT (!(rxd->flags & VMXNET3_RXF_BTYPE));
          /* start segment */
-         if ((vd->lro_enable) &&
+         if (vd->gso_enable &&
              (rx_comp->flags & VMXNET3_RXCF_CT) == VMXNET3_RXCOMP_TYPE_LRO)
            {
              vmxnet3_rx_comp_ext *lro = (vmxnet3_rx_comp_ext *) rx_comp;
@@ -317,12 +316,19 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       else if (rx_comp->index & VMXNET3_RXCI_EOP)
        {
          /* end of segment */
-         if (prev_b0)
+         if (PREDICT_TRUE (prev_b0 != 0))
            {
-             prev_b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
-             prev_b0->next_buffer = bi0;
-             hb->total_length_not_including_first_buffer +=
-               b0->current_length;
+             if (PREDICT_TRUE (b0->current_length != 0))
+               {
+                 prev_b0->flags |= VLIB_BUFFER_NEXT_PRESENT;
+                 prev_b0->next_buffer = bi0;
+                 hb->total_length_not_including_first_buffer +=
+                   b0->current_length;
+               }
+             else
+               {
+                 vlib_buffer_free_one (vm, bi0);
+               }
              prev_b0 = 0;
              got_packet = 1;
            }
@@ -387,7 +393,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
              ethernet_header_t *e = (ethernet_header_t *) hb->data;
 
              next[0] = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-             if (!ethernet_frame_is_tagged (e->type))
+             if (!ethernet_frame_is_tagged (ntohs (e->type)))
                vmxnet3_handle_offload (rx_comp, hb, gso_size);
            }
 
@@ -437,7 +443,7 @@ vmxnet3_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       vlib_increment_combined_counter
        (vnm->interface_main.combined_sw_if_counters +
         VNET_INTERFACE_COUNTER_RX, thread_index,
-        vd->hw_if_index, n_rx_packets, n_rx_bytes);
+        vd->sw_if_index, n_rx_packets, n_rx_bytes);
     }
 
   error = vmxnet3_rxq_refill_ring0 (vm, vd, rxq);
@@ -481,6 +487,7 @@ VLIB_NODE_FN (vmxnet3_input_node) (vlib_main_t * vm,
 VLIB_REGISTER_NODE (vmxnet3_input_node) = {
   .name = "vmxnet3-input",
   .sibling_of = "device-input",
+  .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
   .format_trace = format_vmxnet3_input_trace,
   .type = VLIB_NODE_TYPE_INPUT,
   .state = VLIB_NODE_STATE_DISABLED,