net/enic: consolidate and remove some defines

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

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 14563db..c9901fa 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -6,6 +6,8 @@
 #ifndef _ENIC_H_
 #define _ENIC_H_
 
+#include <rte_vxlan.h>
+#include <rte_ether.h>
 #include "vnic_enet.h"
 #include "vnic_dev.h"
 #include "vnic_flowman.h"
@@ -51,9 +53,6 @@
 
 #define ENICPMD_FDIR_MAX           64
 
-/* HW default VXLAN port */
-#define ENIC_DEFAULT_VXLAN_PORT           4789
-
 /*
  * Interrupt 0: LSC and errors
  * Interrupt 1: rx queue 0
@@ -65,16 +64,16 @@
 
 struct enic_fdir_node {
        struct rte_eth_fdir_filter filter;
-       u16 fltr_id;
-       u16 rq_index;
+       uint16_t fltr_id;
+       uint16_t rq_index;
 };
 
 struct enic_fdir {
        struct rte_eth_fdir_stats stats;
        struct rte_hash *hash;
        struct enic_fdir_node *nodes[ENICPMD_FDIR_MAX];
-       u32 modes;
-       u32 types_mask;
+       uint32_t modes;
+       uint32_t types_mask;
        void (*copy_fltr_fn)(struct filter_v2 *filt,
                             const struct rte_eth_fdir_input *input,
                             const struct rte_eth_fdir_masks *masks);
@@ -127,17 +126,17 @@ struct enic {
        int iommu_group_fd;
        int iommu_groupid;
        int eventfd;
-       uint8_t mac_addr[ETH_ALEN];
+       uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
        pthread_t err_intr_thread;
        int promisc;
        int allmulti;
-       u8 ig_vlan_strip_en;
+       uint8_t ig_vlan_strip_en;
        int link_status;
-       u8 hw_ip_checksum;
-       u16 max_mtu;
-       u8 adv_filters;
-       u32 flow_filter_mode;
-       u8 filter_actions; /* HW supported actions */
+       uint8_t hw_ip_checksum;
+       uint16_t max_mtu;
+       uint8_t adv_filters;
+       uint32_t flow_filter_mode;
+       uint8_t filter_actions; /* HW supported actions */
        bool vxlan;
        bool disable_overlay; /* devargs disable_overlay=1 */
        uint8_t enable_avx2_rx;  /* devargs enable-avx2-rx=1 */
@@ -340,7 +339,7 @@ void enic_clsf_destroy(struct enic *enic);
 int enic_fm_init(struct enic *enic);
 void enic_fm_destroy(struct enic *enic);
 void *enic_alloc_consistent(void *priv, size_t size, dma_addr_t *dma_handle,
-                           u8 *name);
+                           uint8_t *name);
 void enic_free_consistent(void *priv, size_t size, void *vaddr,
                          dma_addr_t dma_handle);
 uint16_t enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,