vnet_buffer_t flags cleanup

[vpp.git] / src / plugins / ixge / ixge.c

diff --git a/src/plugins/ixge/ixge.c b/src/plugins/ixge/ixge.c
index 4eebc45..e0150f4 100644 (file)
--- a/src/plugins/ixge/ixge.c
+++ b/src/plugins/ixge/ixge.c
@@ -20,7 +20,7 @@
  *   Please use supported DPDK driver instead.
  */
 
-#if __x86_64__
+#if __x86_64__ || __i386__
 #include <vppinfra/vector.h>
 
 #ifndef CLIB_HAVE_VEC128
@@ -656,11 +656,11 @@ ixge_rx_next_and_error_from_status_x1 (ixge_device_t * xd,
 
   f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
                | IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-       ? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+       ? VNET_BUFFER_F_L4_CHECKSUM_COMPUTED : 0);
 
   f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
                 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-        ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+        ? 0 : VNET_BUFFER_F_L4_CHECKSUM_CORRECT);
 
   *error0 = e0;
   *next0 = n0;
@@ -715,17 +715,17 @@ ixge_rx_next_and_error_from_status_x2 (ixge_device_t * xd,
 
   f0 = ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
                | IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-       ? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+       ? VNET_BUFFER_F_L4_CHECKSUM_COMPUTED : 0);
   f1 = ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_IS_TCP_CHECKSUMMED
                | IXGE_RX_DESCRIPTOR_STATUS2_IS_UDP_CHECKSUMMED))
-       ? IP_BUFFER_L4_CHECKSUM_COMPUTED : 0);
+       ? VNET_BUFFER_F_L4_CHECKSUM_COMPUTED : 0);
 
   f0 |= ((s02 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
                 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-        ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+        ? 0 : VNET_BUFFER_F_L4_CHECKSUM_CORRECT);
   f1 |= ((s12 & (IXGE_RX_DESCRIPTOR_STATUS2_TCP_CHECKSUM_ERROR
                 | IXGE_RX_DESCRIPTOR_STATUS2_UDP_CHECKSUM_ERROR))
-        ? 0 : IP_BUFFER_L4_CHECKSUM_CORRECT);
+        ? 0 : VNET_BUFFER_F_L4_CHECKSUM_CORRECT);
 
   *flags0 = f0;
   *flags1 = f1;
@@ -1887,7 +1887,7 @@ done:
   vlib_increment_combined_counter (vnet_main.
                                   interface_main.combined_sw_if_counters +
                                   VNET_INTERFACE_COUNTER_RX,
-                                  0 /* cpu_index */ ,
+                                  0 /* thread_index */ ,
                                   xd->vlib_sw_if_index, n_packets,
                                   dq->rx.n_bytes);
 
@@ -2454,7 +2454,6 @@ VNET_DEVICE_CLASS (ixge_device_class) = {
   .clear_counters = ixge_clear_hw_interface_counters,
   .admin_up_down_function = ixge_interface_admin_up_down,
   .rx_redirect_to_node = ixge_set_interface_next_node,
-  .flatten_output_chains = 1,
 };
 /* *INDENT-ON* */
 
@@ -2929,15 +2928,17 @@ ixge_set_next_node (ixge_rx_next_t next, char *name)
       break;
     }
 }
-#endif
 
 /* *INDENT-OFF* */
 VLIB_PLUGIN_REGISTER () = {
     .version = VPP_BUILD_VER,
     .default_disabled = 1,
+    .description = "Intel 82599 Family Native Driver (experimental)",
 };
+#endif
 
 /* *INDENT-ON* */
+
 /*
  * fd.io coding-style-patch-verification: ON
  *