X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fenic%2Fbase%2Frq_enet_desc.h;h=c79c0287bfad7f0a215635e9f5c7210179ded15e;hb=4d4e245ad637c0befbd6da9976c28174a1d74b88;hp=3585bf3ab6590f9d8ab4c5db9ac70af9276c9ef8;hpb=2e99ea80f8bc0f10e9e7226e6cea3aa307891727;p=dpdk.git diff --git a/drivers/net/enic/base/rq_enet_desc.h b/drivers/net/enic/base/rq_enet_desc.h index 3585bf3ab6..c79c0287bf 100644 --- a/drivers/net/enic/base/rq_enet_desc.h +++ b/drivers/net/enic/base/rq_enet_desc.h @@ -6,11 +6,13 @@ #ifndef _RQ_ENET_DESC_H_ #define _RQ_ENET_DESC_H_ +#include + /* Ethernet receive queue descriptor: 16B */ struct rq_enet_desc { - __le64 address; - __le16 length_type; - u8 reserved[6]; + uint64_t address; + uint16_t length_type; + uint8_t reserved[6]; }; enum rq_enet_type_types { @@ -27,20 +29,20 @@ enum rq_enet_type_types { #define RQ_ENET_TYPE_MASK ((1 << RQ_ENET_TYPE_BITS) - 1) static inline void rq_enet_desc_enc(volatile struct rq_enet_desc *desc, - u64 address, u8 type, u16 length) + uint64_t address, uint8_t type, uint16_t 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) + uint64_t *address, uint8_t *type, uint16_t *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) & - RQ_ENET_TYPE_MASK); + *address = rte_le_to_cpu_64(desc->address); + *length = rte_le_to_cpu_16(desc->length_type) & RQ_ENET_LEN_MASK; + *type = (uint8_t)((rte_le_to_cpu_16(desc->length_type) >> + RQ_ENET_LEN_BITS) & RQ_ENET_TYPE_MASK); } #endif /* _RQ_ENET_DESC_H_ */