X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fbase%2Fwq_enet_desc.h;fp=drivers%2Fnet%2Fenic%2Fbase%2Fwq_enet_desc.h;h=e1ad1879871e5f0e05403b834b27bd6ea741e163;hb=04e8ec74192ae4bc537e4854410551255bf85cf5;hp=4dcc3e0be697339e77a89c42b671e3bf20fa470b;hpb=846ac76c82a262069f6573387ef04ba1882deeb6;p=dpdk.git

diff --git a/drivers/net/enic/base/wq_enet_desc.h b/drivers/net/enic/base/wq_enet_desc.h
index 4dcc3e0be6..e1ad187987 100644
--- a/drivers/net/enic/base/wq_enet_desc.h
+++ b/drivers/net/enic/base/wq_enet_desc.h
@@ -10,11 +10,11 @@
 
 /* Ethernet work queue descriptor: 16B */
 struct wq_enet_desc {
-	__le64 address;
-	__le16 length;
-	__le16 mss_loopback;
-	__le16 header_length_flags;
-	__le16 vlan_tag;
+	uint64_t address;
+	uint16_t length;
+	uint16_t mss_loopback;
+	uint16_t header_length_flags;
+	uint16_t vlan_tag;
 };
 
 #define WQ_ENET_ADDR_BITS		64
@@ -39,9 +39,9 @@ struct wq_enet_desc {
 #define WQ_ENET_OFFLOAD_MODE_TSO	3
 
 static inline void wq_enet_desc_enc(struct wq_enet_desc *desc,
-	u64 address, u16 length, u16 mss, u16 header_length,
-	u8 offload_mode, u8 eop, u8 cq_entry, u8 fcoe_encap,
-	u8 vlan_tag_insert, u16 vlan_tag, u8 loopback)
+	uint64_t address, uint16_t length, uint16_t mss, uint16_t header_length,
+	uint8_t offload_mode, uint8_t eop, uint8_t cq_entry, uint8_t fcoe_encap,
+	uint8_t vlan_tag_insert, uint16_t vlan_tag, uint8_t loopback)
 {
 	desc->address = rte_cpu_to_le_64(address);
 	desc->length = rte_cpu_to_le_16(length & WQ_ENET_LEN_MASK);
@@ -58,27 +58,30 @@ static inline void wq_enet_desc_enc(struct wq_enet_desc *desc,
 }
 
 static inline void wq_enet_desc_dec(struct wq_enet_desc *desc,
-	u64 *address, u16 *length, u16 *mss, u16 *header_length,
-	u8 *offload_mode, u8 *eop, u8 *cq_entry, u8 *fcoe_encap,
-	u8 *vlan_tag_insert, u16 *vlan_tag, u8 *loopback)
+	uint64_t *address, uint16_t *length, uint16_t *mss,
+	uint16_t *header_length, uint8_t *offload_mode, uint8_t *eop,
+	uint8_t *cq_entry, uint8_t *fcoe_encap, uint8_t *vlan_tag_insert,
+	uint16_t *vlan_tag, uint8_t *loopback)
 {
 	*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)((rte_le_to_cpu_16(desc->mss_loopback) >>
+	*loopback = (uint8_t)((rte_le_to_cpu_16(desc->mss_loopback) >>
 		WQ_ENET_LOOPBACK_SHIFT) & 1);
 	*header_length = rte_le_to_cpu_16(desc->header_length_flags) &
 		WQ_ENET_HDRLEN_MASK;
-	*offload_mode = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
+	*offload_mode =
+		(uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_HDRLEN_BITS) & WQ_ENET_FLAGS_OM_MASK);
-	*eop = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
+	*eop = (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_EOP_SHIFT) & 1);
-	*cq_entry = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
+	*cq_entry = (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_CQ_ENTRY_SHIFT) & 1);
-	*fcoe_encap = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
+	*fcoe_encap = (uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_FCOE_ENCAP_SHIFT) & 1);
-	*vlan_tag_insert = (u8)((rte_le_to_cpu_16(desc->header_length_flags) >>
+	*vlan_tag_insert =
+		(uint8_t)((rte_le_to_cpu_16(desc->header_length_flags) >>
 		WQ_ENET_FLAGS_VLAN_TAG_INSERT_SHIFT) & 1);
 	*vlan_tag = rte_le_to_cpu_16(desc->vlan_tag);
 }