X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fdevices%2Fdpdk%2Fdpdk.h;h=05f74b849f5058556f99727bf795a3add0bc5c25;hb=ce3e971;hp=1c3d0bb860f7959e353f6a27d92e8882973bfd54;hpb=a06dfb39c6bee3fbfd702c10e1e1416b98e65455;p=vpp.git

diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h
index 1c3d0bb860f..05f74b849f5 100644
--- a/vnet/vnet/devices/dpdk/dpdk.h
+++ b/vnet/vnet/devices/dpdk/dpdk.h
@@ -86,7 +86,6 @@ typedef enum {
   _ ("rte_i40e_pmd", I40E)        \
   _ ("rte_i40evf_pmd", I40EVF)    \
   _ ("rte_virtio_pmd", VIRTIO)    \
-  _ ("rte_vice_pmd", VICE)        \
   _ ("rte_enic_pmd", ENIC)        \
   _ ("rte_vmxnet3_pmd", VMXNET3)  \
   _ ("AF_PACKET PMD", AF_PACKET)  \
@@ -100,9 +99,6 @@ typedef enum {
 #define _(s,f) VNET_DPDK_PMD_##f,
   foreach_dpdk_pmd
 #undef _
-#ifdef NETMAP
-  VNET_DPDK_PMD_NETMAP,
-#endif
   VNET_DPDK_PMD_UNKNOWN, /* must be last */
 } dpdk_pmd_t;
 
@@ -112,9 +108,6 @@ typedef enum {
   VNET_DPDK_PORT_TYPE_ETH_40G,
   VNET_DPDK_PORT_TYPE_ETH_BOND,
   VNET_DPDK_PORT_TYPE_ETH_SWITCH,
-#ifdef NETMAP
-  VNET_DPDK_PORT_TYPE_NETMAP,
-#endif
   VNET_DPDK_PORT_TYPE_AF_PACKET,
   VNET_DPDK_PORT_TYPE_UNKNOWN,
 } dpdk_port_type_t;
@@ -142,9 +135,7 @@ typedef struct {
   int callfd;
   int kickfd;
   int errfd;
-#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
   int enabled;
-#endif
   u32 callfd_idx;
   u32 n_since_last_int;
   f64 int_deadline;
@@ -164,11 +155,7 @@ typedef struct {
 
   u64 feature_mask;
   u32 num_vrings;
-#if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
   dpdk_vu_vring vrings[VHOST_MAX_QUEUE_PAIRS * 2];
-#else
-  dpdk_vu_vring vrings[2];
-#endif
   u64 region_addr[VHOST_MEMORY_MAX_NREGIONS];
   u32 region_fd[VHOST_MEMORY_MAX_NREGIONS];
   u64 region_offset[VHOST_MEMORY_MAX_NREGIONS];
@@ -260,22 +247,6 @@ typedef struct {
   u8 need_txlock; /* Used by VNET_DPDK_DEV_VHOST_USER */
 } dpdk_device_t;
 
-#define MAX_NELTS 32
-typedef struct {
-  CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
-  u64 head;
-  u64 head_hint;
-  u64 tail;
-  u32 n_in_use;
-  u32 nelts;
-  u32 written;
-  u32 threshold;
-  i32 n_vectors[MAX_NELTS];
-} frame_queue_trace_t;
-
-typedef struct {
-  u64 count[MAX_NELTS];
-} frame_queue_nelt_counter_t;
 
 #define DPDK_TX_RING_SIZE (4 * 1024)
 
@@ -323,6 +294,11 @@ typedef struct dpdk_efd_t {
 typedef struct {
     vlib_pci_addr_t pci_addr;
     u8 is_blacklisted;
+    u8 vlan_strip_offload;
+#define DPDK_DEVICE_VLAN_STRIP_DEFAULT 0
+#define DPDK_DEVICE_VLAN_STRIP_OFF 1
+#define DPDK_DEVICE_VLAN_STRIP_ON  2
+
 #define _(x) uword x;
     foreach_dpdk_device_config_item
 #undef _
@@ -348,7 +324,7 @@ typedef struct {
 
   /*
    * format interface names ala xxxEthernet%d/%d/%d instead of
-   * xxxEthernet%x/%x/%x. For VIRL.
+   * xxxEthernet%x/%x/%x.
    */
   u8 interface_name_format_decimal;
 
@@ -393,9 +369,6 @@ typedef struct {
   /* Ethernet input node index */
   u32 ethernet_input_node_index;
 
-  /* dpdk i/o thread initialization barrier */
-  volatile u32 worker_thread_release;
-
   /* pcap tracing [only works if (CLIB_DEBUG > 0)] */
   int tx_pcap_enable;
   pcap_main_t pcap_main;
@@ -430,10 +403,6 @@ typedef struct {
   f64 link_state_poll_interval;
   f64 stat_poll_interval;
 
-  /* for frame queue tracing */
-  frame_queue_trace_t        *frame_queue_traces;
-  frame_queue_nelt_counter_t *frame_queue_histogram;
-
   /* Sleep for this many MS after each device poll */
   u32 poll_sleep;