git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vdpa/mlx5: support queue update
[dpdk.git]
/
drivers
/
net
/
enic
/
enic_rxtx_common.h
diff --git
a/drivers/net/enic/enic_rxtx_common.h
b/drivers/net/enic/enic_rxtx_common.h
index
bfbb490
..
d8668d1
100644
(file)
--- 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_
#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)
{
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)
{
}
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;
}
~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)
{
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;
}
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)
{
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)
{
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)
{
}
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;
}
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;
}
CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;
}
@@
-226,7
+229,8
@@
enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf)
if (filter_id) {
pkt_flags |= PKT_RX_FDIR;
if (filter_id != ENIC_MAGIC_FILTER_ID) {
if (filter_id) {
pkt_flags |= PKT_RX_FDIR;
if (filter_id != ENIC_MAGIC_FILTER_ID) {
- mbuf->hash.fdir.hi = clsf_cqd->filter_id;
+ /* filter_id = mark id + 1, so subtract 1 */
+ mbuf->hash.fdir.hi = filter_id - 1;
pkt_flags |= PKT_RX_FDIR_ID;
}
}
pkt_flags |= PKT_RX_FDIR_ID;
}
}