net/enic: replace some PMD macros with standard API

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

diff --git a/drivers/net/enic/base/wq_enet_desc.h b/drivers/net/enic/base/wq_enet_desc.h
index cdf22ff..4dcc3e0 100644 (file)
--- 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_ */