net/mlx5: fix flow mark with sampling and metering

[dpdk.git] / drivers / net / tap / rte_eth_tap.h

diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h
index 4502e24..996021e 100644 (file)
--- a/drivers/net/tap/rte_eth_tap.h
+++ b/drivers/net/tap/rte_eth_tap.h
@@ -13,7 +13,7 @@
 
 #include <linux/if_tun.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_gso.h>
 #include "tap_log.h"
@@ -47,7 +47,6 @@ struct rx_queue {
        uint32_t trigger_seen;          /* Last seen Rx trigger value */
        uint16_t in_port;               /* Port ID */
        uint16_t queue_id;              /* queue ID*/
-       int fd;
        struct pkt_stats stats;         /* Stats for this RX queue */
        uint16_t nb_rx_desc;            /* max number of mbufs available */
        struct rte_eth_rxmode *rxmode;  /* RX features */
@@ -57,7 +56,6 @@ struct rx_queue {
 };
 
 struct tx_queue {
-       int fd;
        int type;                       /* Type field - TUN|TAP */
        uint16_t *mtu;                  /* Pointer to MTU from dev_data */
        uint16_t csum:1;                /* Enable checksum offloading */
@@ -72,8 +70,8 @@ struct pmd_internals {
        char remote_iface[RTE_ETH_NAME_MAX_LEN]; /* Remote netdevice name */
        char name[RTE_ETH_NAME_MAX_LEN];  /* Internal Tap device name */
        int type;                         /* Type field - TUN|TAP */
-       struct ether_addr eth_addr;       /* Mac address of the device port */
-       struct ifreq remote_initial_flags;   /* Remote netdevice flags on init */
+       struct rte_ether_addr eth_addr;   /* Mac address of the device port */
+       struct ifreq remote_initial_flags;/* Remote netdevice flags on init */
        int remote_if_index;              /* remote netdevice IF_INDEX */
        int if_index;                     /* IF_INDEX for the port */
        int ioctl_sock;                   /* socket for ioctl calls */
@@ -91,8 +89,14 @@ struct pmd_internals {
        LIST_HEAD(tap_implicit_flows, rte_flow) implicit_flows;
        struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */
        struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */
-       struct rte_intr_handle intr_handle;          /* LSC interrupt handle. */
+       struct rte_intr_handle *intr_handle;         /* LSC interrupt handle. */
        int ka_fd;                        /* keep-alive file descriptor */
+       struct rte_mempool *gso_ctx_mp;     /* Mempool for GSO packets */
+};
+
+struct pmd_process_private {
+       int rxq_fds[RTE_PMD_TAP_MAX_QUEUES];
+       int txq_fds[RTE_PMD_TAP_MAX_QUEUES];
 };
 
 /* tap_intr.c */