New upstream version 17.08

[deb_dpdk.git] / drivers / net / enic / enic.h

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index d17a35f..e28f223 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -80,6 +80,8 @@
 #define PCI_DEVICE_ID_CISCO_VIC_ENET         0x0043  /* ethernet vnic */
 #define PCI_DEVICE_ID_CISCO_VIC_ENET_VF      0x0071  /* enet SRIOV VF */
 
+/* Special Filter id for non-specific packet flagging. Don't change value */
+#define ENIC_MAGIC_FILTER_ID 0xffff
 
 #define ENICPMD_FDIR_MAX           64
 
@@ -111,6 +113,12 @@ struct enic_memzone_entry {
        LIST_ENTRY(enic_memzone_entry) entries;
 };
 
+struct rte_flow {
+       LIST_ENTRY(rte_flow) next;
+       u16 enic_filter_id;
+       struct filter_v2 enic_filter;
+};
+
 /* Per-instance private data structure */
 struct enic {
        struct enic *next;
@@ -135,7 +143,9 @@ struct enic {
        int link_status;
        u8 hw_ip_checksum;
        u16 max_mtu;
-       u16 adv_filters;
+       u8 adv_filters;
+       u32 flow_filter_mode;
+       u8 filter_tags;
 
        unsigned int flags;
        unsigned int priv_flags;
@@ -170,6 +180,8 @@ struct enic {
        rte_spinlock_t memzone_list_lock;
        rte_spinlock_t mtu_lock;
 
+       LIST_HEAD(enic_flows, rte_flow) flows;
+       rte_spinlock_t flows_lock;
 };
 
 /* Get the CQ index from a Start of Packet(SOP) RQ index */
@@ -293,9 +305,9 @@ extern int enic_clsf_init(struct enic *enic);
 extern void enic_clsf_destroy(struct enic *enic);
 uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                        uint16_t nb_pkts);
-uint16_t enic_dummy_recv_pkts(__rte_unused void *rx_queue,
-                             __rte_unused struct rte_mbuf **rx_pkts,
-                             __rte_unused uint16_t nb_pkts);
+uint16_t enic_dummy_recv_pkts(void *rx_queue,
+                             struct rte_mbuf **rx_pkts,
+                             uint16_t nb_pkts);
 uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                               uint16_t nb_pkts);
 int enic_set_mtu(struct enic *enic, uint16_t new_mtu);
@@ -303,7 +315,8 @@ int enic_link_update(struct enic *enic);
 void enic_fdir_info(struct enic *enic);
 void enic_fdir_info_get(struct enic *enic, struct rte_eth_fdir_info *stats);
 void copy_fltr_v1(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
-                 __rte_unused struct rte_eth_fdir_masks *masks);
+                 struct rte_eth_fdir_masks *masks);
 void copy_fltr_v2(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
                  struct rte_eth_fdir_masks *masks);
+extern const struct rte_flow_ops enic_flow_ops;
 #endif /* _ENIC_H_ */