net/enic: use standard RTE defines
diff mbox series

Message ID 20200114002451.16248-1-johndale@cisco.com
State Accepted
Delegated to: Ferruh Yigit
Headers show
Series
  • net/enic: use standard RTE defines
Related show

Checks

Context Check Description
ci/travis-robot success Travis build: passed
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/Intel-compilation fail Compilation issues
ci/checkpatch success coding style OK

Commit Message

John Daley Jan. 14, 2020, 12:24 a.m. UTC
Use the memzone namesize, Ethernet address length defines from the RTE
header files instead of locally defined versions.
Use the RTE byte swap functions instead of the x86 specific locally
defined versions.

Signed-off-by: John Daley <johndale@cisco.com>
Reviewed-by: Hyong Youb Kim <hyonkim@cisco.com>
---
 drivers/net/enic/base/cq_desc.h      |  9 ++++---
 drivers/net/enic/base/cq_enet_desc.h | 39 ++++++++++++++--------------
 drivers/net/enic/base/rq_enet_desc.h | 12 +++++----
 drivers/net/enic/base/vnic_cq.c      |  3 ++-
 drivers/net/enic/base/vnic_dev.c     | 21 ++++++++-------
 drivers/net/enic/base/vnic_rq.c      |  3 ++-
 drivers/net/enic/base/vnic_wq.c      |  2 +-
 drivers/net/enic/base/wq_enet_desc.h | 36 +++++++++++++------------
 drivers/net/enic/enic.h              |  4 +--
 drivers/net/enic/enic_compat.h       |  8 ------
 drivers/net/enic/enic_fm_flow.c      |  5 ++--
 drivers/net/enic/enic_main.c         | 10 +++----
 drivers/net/enic/enic_rxtx_common.h  | 17 +++++++-----
 13 files changed, 87 insertions(+), 82 deletions(-)

Comments

Ferruh Yigit Jan. 14, 2020, 5:57 p.m. UTC | #1
On 1/14/2020 12:24 AM, John Daley wrote:
> Use the memzone namesize, Ethernet address length defines from the RTE
> header files instead of locally defined versions.
> Use the RTE byte swap functions instead of the x86 specific locally
> defined versions.
> 
> Signed-off-by: John Daley <johndale@cisco.com>
> Reviewed-by: Hyong Youb Kim <hyonkim@cisco.com>

Applied to dpdk-next-net/master, thanks.

Patch
diff mbox series

diff --git a/drivers/net/enic/base/cq_desc.h b/drivers/net/enic/base/cq_desc.h
index ae8847c6d9..52e0402bdf 100644
--- a/drivers/net/enic/base/cq_desc.h
+++ b/drivers/net/enic/base/cq_desc.h
@@ -5,6 +5,7 @@ 
 
 #ifndef _CQ_DESC_H_
 #define _CQ_DESC_H_
+#include <rte_byteorder.h>
 
 /*
  * Completion queue descriptor types
@@ -58,8 +59,8 @@  static inline void cq_desc_enc(struct cq_desc *desc,
 {
 	desc->type_color = (type & CQ_DESC_TYPE_MASK) |
 		((color & CQ_DESC_COLOR_MASK) << CQ_DESC_COLOR_SHIFT);
-	desc->q_number = cpu_to_le16(q_number & CQ_DESC_Q_NUM_MASK);
-	desc->completed_index = cpu_to_le16(completed_index &
+	desc->q_number = rte_cpu_to_le_16(q_number & CQ_DESC_Q_NUM_MASK);
+	desc->completed_index = rte_cpu_to_le_16(completed_index &
 		CQ_DESC_COMP_NDX_MASK);
 }
 
@@ -82,8 +83,8 @@  static inline void cq_desc_dec(const struct cq_desc *desc_arg,
 	rmb();
 
 	*type = type_color & CQ_DESC_TYPE_MASK;
-	*q_number = le16_to_cpu(desc->q_number) & CQ_DESC_Q_NUM_MASK;
-	*completed_index = le16_to_cpu(desc->completed_index) &
+	*q_number = rte_le_to_cpu_16(desc->q_number) & CQ_DESC_Q_NUM_MASK;
+	*completed_index = rte_le_to_cpu_16(desc->completed_index) &
 		CQ_DESC_COMP_NDX_MASK;
 }
 
diff --git a/drivers/net/enic/base/cq_enet_desc.h b/drivers/net/enic/base/cq_enet_desc.h
index 5ced63cb16..995b9cca98 100644
--- a/drivers/net/enic/base/cq_enet_desc.h
+++ b/drivers/net/enic/base/cq_enet_desc.h
@@ -6,6 +6,7 @@ 
 #ifndef _CQ_ENET_DESC_H_
 #define _CQ_ENET_DESC_H_
 
+#include <rte_byteorder.h>
 #include "cq_desc.h"
 
 /* Ethernet completion queue descriptor: 16B */
@@ -118,33 +119,33 @@  static inline void cq_enet_rq_desc_enc(struct cq_enet_rq_desc *desc,
 	cq_desc_enc((struct cq_desc *)desc, type,
 		color, q_number, completed_index);
 
-	desc->completed_index_flags |= cpu_to_le16(
-		(ingress_port ? CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT : 0) |
+	desc->completed_index_flags |= rte_cpu_to_le_16
+		((ingress_port ? CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT : 0) |
 		(fcoe ? CQ_ENET_RQ_DESC_FLAGS_FCOE : 0) |
 		(eop ? CQ_ENET_RQ_DESC_FLAGS_EOP : 0) |
 		(sop ? CQ_ENET_RQ_DESC_FLAGS_SOP : 0));
 
-	desc->q_number_rss_type_flags |= cpu_to_le16(
-		((rss_type & CQ_ENET_RQ_DESC_RSS_TYPE_MASK) <<
+	desc->q_number_rss_type_flags |= rte_cpu_to_le_16
+		(((rss_type & CQ_ENET_RQ_DESC_RSS_TYPE_MASK) <<
 		CQ_DESC_Q_NUM_BITS) |
 		(csum_not_calc ? CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC : 0));
 
-	desc->rss_hash = cpu_to_le32(rss_hash);
+	desc->rss_hash = rte_cpu_to_le_32(rss_hash);
 
-	desc->bytes_written_flags = cpu_to_le16(
-		(bytes_written & CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK) |
+	desc->bytes_written_flags = rte_cpu_to_le_16
+		((bytes_written & CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK) |
 		(packet_error ? CQ_ENET_RQ_DESC_FLAGS_TRUNCATED : 0) |
 		(vlan_stripped ? CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED : 0));
 
-	desc->vlan = cpu_to_le16(vlan);
+	desc->vlan = rte_cpu_to_le_16(vlan);
 
 	if (fcoe) {
-		desc->checksum_fcoe = cpu_to_le16(
-			(fcoe_sof & CQ_ENET_RQ_DESC_FCOE_SOF_MASK) |
+		desc->checksum_fcoe = rte_cpu_to_le_16
+			((fcoe_sof & CQ_ENET_RQ_DESC_FCOE_SOF_MASK) |
 			((fcoe_eof & CQ_ENET_RQ_DESC_FCOE_EOF_MASK) <<
 				CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT));
 	} else {
-		desc->checksum_fcoe = cpu_to_le16(checksum);
+		desc->checksum_fcoe = rte_cpu_to_le_16(checksum);
 	}
 
 	desc->flags =
@@ -176,10 +177,10 @@  static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
 	cq_desc_dec((struct cq_desc *)desc, type,
 		color, q_number, completed_index);
 
-	completed_index_flags = le16_to_cpu(desc->completed_index_flags);
+	completed_index_flags = rte_le_to_cpu_16(desc->completed_index_flags);
 	q_number_rss_type_flags =
-		le16_to_cpu(desc->q_number_rss_type_flags);
-	bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);
+		rte_le_to_cpu_16(desc->q_number_rss_type_flags);
+	bytes_written_flags = rte_le_to_cpu_16(desc->bytes_written_flags);
 
 	*ingress_port = (completed_index_flags &
 		CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;
@@ -195,7 +196,7 @@  static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
 	*csum_not_calc = (q_number_rss_type_flags &
 		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;
 
-	*rss_hash = le32_to_cpu(desc->rss_hash);
+	*rss_hash = rte_le_to_cpu_32(desc->rss_hash);
 
 	*bytes_written = bytes_written_flags &
 		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;
@@ -207,16 +208,16 @@  static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
 	/*
 	 * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)
 	 */
-	*vlan_tci = le16_to_cpu(desc->vlan);
+	*vlan_tci = rte_le_to_cpu_16(desc->vlan);
 
 	if (*fcoe) {
-		*fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) &
+		*fcoe_sof = (u8)(rte_le_to_cpu_16(desc->checksum_fcoe) &
 			CQ_ENET_RQ_DESC_FCOE_SOF_MASK);
 		*fcoe_fc_crc_ok = (desc->flags &
 			CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;
 		*fcoe_enc_error = (desc->flags &
 			CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;
-		*fcoe_eof = (u8)((le16_to_cpu(desc->checksum_fcoe) >>
+		*fcoe_eof = (u8)((rte_le_to_cpu_16(desc->checksum_fcoe) >>
 			CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &
 			CQ_ENET_RQ_DESC_FCOE_EOF_MASK);
 		*checksum = 0;
@@ -225,7 +226,7 @@  static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,
 		*fcoe_fc_crc_ok = 0;
 		*fcoe_enc_error = 0;
 		*fcoe_eof = 0;
-		*checksum = le16_to_cpu(desc->checksum_fcoe);
+		*checksum = rte_le_to_cpu_16(desc->checksum_fcoe);
 	}
 
 	*tcp_udp_csum_ok =
diff --git a/drivers/net/enic/base/rq_enet_desc.h b/drivers/net/enic/base/rq_enet_desc.h
index 3585bf3ab6..15c5994d87 100644
--- a/drivers/net/enic/base/rq_enet_desc.h
+++ b/drivers/net/enic/base/rq_enet_desc.h
@@ -6,6 +6,8 @@ 
 #ifndef _RQ_ENET_DESC_H_
 #define _RQ_ENET_DESC_H_
 
+#include <rte_byteorder.h>
+
 /* Ethernet receive queue descriptor: 16B */
 struct rq_enet_desc {
 	__le64 address;
@@ -29,17 +31,17 @@  enum rq_enet_type_types {
 static inline void rq_enet_desc_enc(volatile struct rq_enet_desc *desc,
 	u64 address, u8 type, u16 length)
 {
-	desc->address = cpu_to_le64(address);
-	desc->length_type = cpu_to_le16((length & RQ_ENET_LEN_MASK) |
+	desc->address = rte_cpu_to_le_64(address);
+	desc->length_type = rte_cpu_to_le_16((length & RQ_ENET_LEN_MASK) |
 		((type & RQ_ENET_TYPE_MASK) << RQ_ENET_LEN_BITS));
 }
 
 static inline void rq_enet_desc_dec(struct rq_enet_desc *desc,
 	u64 *address, u8 *type, u16 *length)
 {
-	*address = le64_to_cpu(desc->address);
-	*length = le16_to_cpu(desc->length_type) & RQ_ENET_LEN_MASK;
-	*type = (u8)((le16_to_cpu(desc->length_type) >> RQ_ENET_LEN_BITS) &
+	*address = rte_le_to_cpu_64(desc->address);
+	*length = rte_le_to_cpu_16(desc->length_type) & RQ_ENET_LEN_MASK;
+	*type = (u8)((rte_le_to_cpu_16(desc->length_type) >> RQ_ENET_LEN_BITS) &
 		RQ_ENET_TYPE_MASK);
 }
 
diff --git a/drivers/net/enic/base/vnic_cq.c b/drivers/net/enic/base/vnic_cq.c
index 63a503f2b2..9d29789f47 100644
--- a/drivers/net/enic/base/vnic_cq.c
+++ b/drivers/net/enic/base/vnic_cq.c
@@ -5,6 +5,7 @@ 
 
 #include "vnic_dev.h"
 #include "vnic_cq.h"
+#include <rte_memzone.h>
 
 void vnic_cq_free(struct vnic_cq *cq)
 {
@@ -18,7 +19,7 @@  int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
 	unsigned int desc_count, unsigned int desc_size)
 {
 	int err;
-	char res_name[NAME_MAX];
+	char res_name[RTE_MEMZONE_NAMESIZE];
 	static int instance;
 
 	cq->index = index;
diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c
index 899df07df7..da33588ad9 100644
--- a/drivers/net/enic/base/vnic_dev.c
+++ b/drivers/net/enic/base/vnic_dev.c
@@ -6,6 +6,7 @@ 
 #include <rte_memzone.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
+#include <rte_ether.h>
 
 #include "vnic_dev.h"
 #include "vnic_resource.h"
@@ -461,7 +462,7 @@  int vnic_dev_cmd_args(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
 int vnic_dev_fw_info(struct vnic_dev *vdev,
 		     struct vnic_devcmd_fw_info **fw_info)
 {
-	char name[NAME_MAX];
+	char name[RTE_MEMZONE_NAMESIZE];
 	u64 a0, a1 = 0;
 	int wait = 1000;
 	int err = 0;
@@ -515,7 +516,7 @@  int vnic_dev_flowman_cmd(struct vnic_dev *vdev, u64 *args, int nargs)
 static int vnic_dev_flowman_enable(struct vnic_dev *vdev, u32 *mode,
 				   u8 *filter_actions)
 {
-	char name[NAME_MAX];
+	char name[RTE_MEMZONE_NAMESIZE];
 	u64 args[3];
 	u64 ops;
 	static u32 instance;
@@ -536,7 +537,7 @@  static int vnic_dev_flowman_enable(struct vnic_dev *vdev, u32 *mode,
 		return 0;
 	/* Can we get fm_info? */
 	if (!vdev->flowman_info) {
-		snprintf((char *)name, sizeof(name), "vnic_flowman_info-%u",
+		snprintf((char *)name, sizeof(name), "vnic_fm_info-%u",
 			 instance++);
 		vdev->flowman_info = vdev->alloc_consistent(vdev->priv,
 			sizeof(struct fm_info),
@@ -770,14 +771,14 @@  int vnic_dev_get_mac_addr(struct vnic_dev *vdev, u8 *mac_addr)
 	int wait = 1000;
 	int err, i;
 
-	for (i = 0; i < ETH_ALEN; i++)
+	for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
 		mac_addr[i] = 0;
 
 	err = vnic_dev_cmd(vdev, CMD_GET_MAC_ADDR, &a0, &a1, wait);
 	if (err)
 		return err;
 
-	for (i = 0; i < ETH_ALEN; i++)
+	for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
 		mac_addr[i] = ((u8 *)&a0)[i];
 
 	return 0;
@@ -810,7 +811,7 @@  int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
 	int err;
 	int i;
 
-	for (i = 0; i < ETH_ALEN; i++)
+	for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
 		((u8 *)&a0)[i] = addr[i];
 
 	err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
@@ -829,7 +830,7 @@  int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
 	int err;
 	int i;
 
-	for (i = 0; i < ETH_ALEN; i++)
+	for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
 		((u8 *)&a0)[i] = addr[i];
 
 	err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
@@ -892,7 +893,7 @@  int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
 {
 	void *notify_addr = NULL;
 	dma_addr_t notify_pa = 0;
-	char name[NAME_MAX];
+	char name[RTE_MEMZONE_NAMESIZE];
 	static u32 instance;
 
 	if (vdev->notify || vdev->notify_pa) {
@@ -1030,7 +1031,7 @@  u32 vnic_dev_get_intr_coal_timer_max(struct vnic_dev *vdev)
 
 int vnic_dev_alloc_stats_mem(struct vnic_dev *vdev)
 {
-	char name[NAME_MAX];
+	char name[RTE_MEMZONE_NAMESIZE];
 	static u32 instance;
 
 	snprintf((char *)name, sizeof(name), "vnic_stats-%u", instance++);
@@ -1069,7 +1070,7 @@  struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev,
 	unsigned int num_bars)
 {
 	if (!vdev) {
-		char name[NAME_MAX];
+		char name[RTE_MEMZONE_NAMESIZE];
 		snprintf((char *)name, sizeof(name), "%s-vnic",
 			  pdev->device.name);
 		vdev = (struct vnic_dev *)rte_zmalloc_socket(name,
diff --git a/drivers/net/enic/base/vnic_rq.c b/drivers/net/enic/base/vnic_rq.c
index 72fcef556d..3956d4f73f 100644
--- a/drivers/net/enic/base/vnic_rq.c
+++ b/drivers/net/enic/base/vnic_rq.c
@@ -3,6 +3,7 @@ 
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
  */
 
+#include <rte_memzone.h>
 #include "vnic_dev.h"
 #include "vnic_rq.h"
 
@@ -21,7 +22,7 @@  int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
 	unsigned int desc_count, unsigned int desc_size)
 {
 	int rc;
-	char res_name[NAME_MAX];
+	char res_name[RTE_MEMZONE_NAMESIZE];
 	static int instance;
 
 	rq->index = index;
diff --git a/drivers/net/enic/base/vnic_wq.c b/drivers/net/enic/base/vnic_wq.c
index c9bf3572cb..c3da572d74 100644
--- a/drivers/net/enic/base/vnic_wq.c
+++ b/drivers/net/enic/base/vnic_wq.c
@@ -20,7 +20,7 @@  static inline
 int vnic_wq_alloc_ring(struct vnic_dev *vdev, struct vnic_wq *wq,
 				unsigned int desc_count, unsigned int desc_size)
 {
-	char res_name[NAME_MAX];
+	char res_name[RTE_MEMZONE_NAMESIZE];
 	static int instance;
 
 	snprintf(res_name, sizeof(res_name), "%d-wq-%u", instance++, wq->index);
diff --git a/drivers/net/enic/base/wq_enet_desc.h b/drivers/net/enic/base/wq_enet_desc.h
index cdf22fff2f..4dcc3e0be6 100644
--- a/drivers/net/enic/base/wq_enet_desc.h
+++ b/drivers/net/enic/base/wq_enet_desc.h
@@ -6,6 +6,8 @@ 
 #ifndef _WQ_ENET_DESC_H_
 #define _WQ_ENET_DESC_H_
 
+#include <rte_byteorder.h>
+
 /* Ethernet work queue descriptor: 16B */
 struct wq_enet_desc {
 	__le64 address;
@@ -41,18 +43,18 @@  static inline void wq_enet_desc_enc(struct wq_enet_desc *desc,
 	u8 offload_mode, u8 eop, u8 cq_entry, u8 fcoe_encap,
 	u8 vlan_tag_insert, u16 vlan_tag, u8 loopback)
 {
-	desc->address = cpu_to_le64(address);
-	desc->length = cpu_to_le16(length & WQ_ENET_LEN_MASK);
-	desc->mss_loopback = cpu_to_le16((mss & WQ_ENET_MSS_MASK) <<
+	desc->address = rte_cpu_to_le_64(address);
+	desc->length = rte_cpu_to_le_16(length & WQ_ENET_LEN_MASK);
+	desc->mss_loopback = rte_cpu_to_le_16((mss & WQ_ENET_MSS_MASK) <<
 		WQ_ENET_MSS_SHIFT | (loopback & 1) << WQ_ENET_LOOPBACK_SHIFT);
-	desc->header_length_flags = cpu_to_le16(
-		(header_length & WQ_ENET_HDRLEN_MASK) |
+	desc->header_length_flags = rte_cpu_to_le_16
+		((header_length & WQ_ENET_HDRLEN_MASK) |
 		(offload_mode & WQ_ENET_FLAGS_OM_MASK) << WQ_ENET_HDRLEN_BITS |
 		(eop & 1) << WQ_ENET_FLAGS_EOP_SHIFT |
 		(cq_entry & 1) << WQ_ENET_FLAGS_CQ_ENTRY_SHIFT |
 		(fcoe_encap & 1) << WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT |
 		(vlan_tag_insert & 1) << WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT);
-	desc->vlan_tag = cpu_to_le16(vlan_tag);
+	desc->vlan_tag = rte_cpu_to_le_16(vlan_tag);
 }
 
 static inline void wq_enet_desc_dec(struct wq_enet_desc *desc,
@@ -60,25 +62,25 @@  static inline void wq_enet_desc_dec(struct wq_enet_desc *desc,
 	u8 *offload_mode, u8 *eop, u8 *cq_entry, u8 *fcoe_encap,
 	u8 *vlan_tag_insert, u16 *vlan_tag, u8 *loopback)
 {
-	*address = le64_to_cpu(desc->address);
-	*length = le16_to_cpu(desc->length) & WQ_ENET_LEN_MASK;
-	*mss = (le16_to_cpu(desc->mss_loopback) >> WQ_ENET_MSS_SHIFT) &
+	*address = rte_le_to_cpu_64(desc->address);
+	*length = rte_le_to_cpu_16(desc->length) & WQ_ENET_LEN_MASK;
+	*mss = (rte_le_to_cpu_16(desc->mss_loopback) >> WQ_ENET_MSS_SHIFT) &
 		WQ_ENET_MSS_MASK;
-	*loopback = (u8)((le16_to_cpu(desc->mss_loopback) >>
+	*loopback = (u8)((rte_le_to_cpu_16(desc->mss_loopback) >>
 		WQ_ENET_LOOPBACK_SHIFT) & 1);
-	*header_length = le16_to_cpu(desc->header_length_flags) &
+	*header_length = rte_le_to_cpu_16(desc->header_length_flags) &
 		WQ_ENET_HDRLEN_MASK;
-	*offload_mode = (u8)((le16_to_cpu(desc->header_length_flags) >>
+	*offload_mode = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_HDRLEN_BITS) & WQ_ENET_FLAGS_OM_MASK);
-	*eop = (u8)((le16_to_cpu(desc->header_length_flags) >>
+	*eop = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_EOP_SHIFT) & 1);
-	*cq_entry = (u8)((le16_to_cpu(desc->header_length_flags) >>
+	*cq_entry = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_CQ_ENTRY_SHIFT) & 1);
-	*fcoe_encap = (u8)((le16_to_cpu(desc->header_length_flags) >>
+	*fcoe_encap = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT) & 1);
-	*vlan_tag_insert = (u8)((le16_to_cpu(desc->header_length_flags) >>
+	*vlan_tag_insert = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT) & 1);
-	*vlan_tag = le16_to_cpu(desc->vlan_tag);
+	*vlan_tag = rte_le_to_cpu_16(desc->vlan_tag);
 }
 
 #endif /* _WQ_ENET_DESC_H_ */
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 4cf73723f1..bb40facee2 100644
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -7,7 +7,7 @@ 
 #define _ENIC_H_
 
 #include <rte_vxlan.h>
-
+#include <rte_ether.h>
 #include "vnic_enet.h"
 #include "vnic_dev.h"
 #include "vnic_flowman.h"
@@ -126,7 +126,7 @@  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;
diff --git a/drivers/net/enic/enic_compat.h b/drivers/net/enic/enic_compat.h
index bdf4edcab4..1bf4b4f3c7 100644
--- a/drivers/net/enic/enic_compat.h
+++ b/drivers/net/enic/enic_compat.h
@@ -16,7 +16,6 @@ 
 
 #define ENIC_PAGE_ALIGN 4096UL
 #define ENIC_ALIGN      ENIC_PAGE_ALIGN
-#define NAME_MAX        255
 #define ETH_ALEN        6
 
 #define __iomem
@@ -24,13 +23,6 @@ 
 #define rmb()     rte_rmb() /* dpdk rte provided rmb */
 #define wmb()     rte_wmb() /* dpdk rte provided wmb */
 
-#define le16_to_cpu
-#define le32_to_cpu
-#define le64_to_cpu
-#define cpu_to_le16
-#define cpu_to_le32
-#define cpu_to_le64
-
 #ifndef offsetof
 #define offsetof(t, m) ((size_t) &((t *)0)->m)
 #endif
diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c
index e3e3d737bc..0e2b21488f 100644
--- a/drivers/net/enic/enic_fm_flow.c
+++ b/drivers/net/enic/enic_fm_flow.c
@@ -10,6 +10,7 @@ 
 #include <rte_ether.h>
 #include <rte_ip.h>
 #include <rte_udp.h>
+#include <rte_memzone.h>
 
 #include "enic_compat.h"
 #include "enic.h"
@@ -2353,7 +2354,7 @@  int
 enic_fm_init(struct enic *enic)
 {
 	struct enic_flowman *fm;
-	u8 name[NAME_MAX];
+	u8 name[RTE_MEMZONE_NAMESIZE];
 	int rc;
 
 	if (enic->flow_filter_mode != FILTER_FLOWMAN)
@@ -2368,7 +2369,7 @@  enic_fm_init(struct enic *enic)
 	TAILQ_INIT(&fm->fet_list);
 	TAILQ_INIT(&fm->jump_list);
 	/* Allocate host memory for flowman commands */
-	snprintf((char *)name, NAME_MAX, "fm-cmd-%s", enic->bdf_name);
+	snprintf((char *)name, sizeof(name), "fm-cmd-%s", enic->bdf_name);
 	fm->cmd.va = enic_alloc_consistent(enic,
 		sizeof(union enic_flowman_cmd_mem), &fm->cmd.pa, name);
 	if (!fm->cmd.va) {
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 57574a5f7e..81bdfee42b 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1010,7 +1010,7 @@  int enic_alloc_wq(struct enic *enic, uint16_t queue_idx,
 	int err;
 	struct vnic_wq *wq = &enic->wq[queue_idx];
 	unsigned int cq_index = enic_cq_wq(enic, queue_idx);
-	char name[NAME_MAX];
+	char name[RTE_MEMZONE_NAMESIZE];
 	static int instance;
 
 	wq->socket_id = socket_id;
@@ -1154,10 +1154,10 @@  static int enic_set_rsskey(struct enic *enic, uint8_t *user_key)
 	dma_addr_t rss_key_buf_pa;
 	union vnic_rss_key *rss_key_buf_va = NULL;
 	int err, i;
-	u8 name[NAME_MAX];
+	u8 name[RTE_MEMZONE_NAMESIZE];
 
 	RTE_ASSERT(user_key != NULL);
-	snprintf((char *)name, NAME_MAX, "rss_key-%s", enic->bdf_name);
+	snprintf((char *)name, sizeof(name), "rss_key-%s", enic->bdf_name);
 	rss_key_buf_va = enic_alloc_consistent(enic, sizeof(union vnic_rss_key),
 		&rss_key_buf_pa, name);
 	if (!rss_key_buf_va)
@@ -1186,9 +1186,9 @@  int enic_set_rss_reta(struct enic *enic, union vnic_rss_cpu *rss_cpu)
 	dma_addr_t rss_cpu_buf_pa;
 	union vnic_rss_cpu *rss_cpu_buf_va = NULL;
 	int err;
-	u8 name[NAME_MAX];
+	u8 name[RTE_MEMZONE_NAMESIZE];
 
-	snprintf((char *)name, NAME_MAX, "rss_cpu-%s", enic->bdf_name);
+	snprintf((char *)name, sizeof(name), "rss_cpu-%s", enic->bdf_name);
 	rss_cpu_buf_va = enic_alloc_consistent(enic, sizeof(union vnic_rss_cpu),
 		&rss_cpu_buf_pa, name);
 	if (!rss_cpu_buf_va)
diff --git a/drivers/net/enic/enic_rxtx_common.h b/drivers/net/enic/enic_rxtx_common.h
index 66f631dfeb..d8668d1898 100644
--- a/drivers/net/enic/enic_rxtx_common.h
+++ b/drivers/net/enic/enic_rxtx_common.h
@@ -6,16 +6,19 @@ 
 #ifndef _ENIC_RXTX_COMMON_H_
 #define _ENIC_RXTX_COMMON_H_
 
+#include <rte_byteorder.h>
+
 static inline uint16_t
 enic_cq_rx_desc_ciflags(struct cq_enet_rq_desc *crd)
 {
-	return le16_to_cpu(crd->completed_index_flags) & ~CQ_DESC_COMP_NDX_MASK;
+	return rte_le_to_cpu_16(crd->completed_index_flags) &
+				~CQ_DESC_COMP_NDX_MASK;
 }
 
 static inline uint16_t
 enic_cq_rx_desc_bwflags(struct cq_enet_rq_desc *crd)
 {
-	return le16_to_cpu(crd->bytes_written_flags) &
+	return rte_le_to_cpu_16(crd->bytes_written_flags) &
 			   ~CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;
 }
 
@@ -36,7 +39,7 @@  enic_cq_rx_desc_eop(uint16_t ciflags)
 static inline uint8_t
 enic_cq_rx_desc_csum_not_calc(struct cq_enet_rq_desc *cqrd)
 {
-	return (le16_to_cpu(cqrd->q_number_rss_type_flags) &
+	return (rte_le_to_cpu_16(cqrd->q_number_rss_type_flags) &
 		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ==
 		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC;
 }
@@ -58,27 +61,27 @@  enic_cq_rx_desc_tcp_udp_csum_ok(struct cq_enet_rq_desc *cqrd)
 static inline uint8_t
 enic_cq_rx_desc_rss_type(struct cq_enet_rq_desc *cqrd)
 {
-	return (uint8_t)((le16_to_cpu(cqrd->q_number_rss_type_flags) >>
+	return (uint8_t)((rte_le_to_cpu_16(cqrd->q_number_rss_type_flags) >>
 		CQ_DESC_Q_NUM_BITS) & CQ_ENET_RQ_DESC_RSS_TYPE_MASK);
 }
 
 static inline uint32_t
 enic_cq_rx_desc_rss_hash(struct cq_enet_rq_desc *cqrd)
 {
-	return le32_to_cpu(cqrd->rss_hash);
+	return rte_le_to_cpu_32(cqrd->rss_hash);
 }
 
 static inline uint16_t
 enic_cq_rx_desc_vlan(struct cq_enet_rq_desc *cqrd)
 {
-	return le16_to_cpu(cqrd->vlan);
+	return rte_le_to_cpu_16(cqrd->vlan);
 }
 
 static inline uint16_t
 enic_cq_rx_desc_n_bytes(struct cq_desc *cqd)
 {
 	struct cq_enet_rq_desc *cqrd = (struct cq_enet_rq_desc *)cqd;
-	return le16_to_cpu(cqrd->bytes_written_flags) &
+	return rte_le_to_cpu_16(cqrd->bytes_written_flags) &
 		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;
 }