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
net/bnxt: fix headroom initialization
[dpdk.git]
/
drivers
/
net
/
bnxt
/
bnxt_rxr.c
diff --git
a/drivers/net/bnxt/bnxt_rxr.c
b/drivers/net/bnxt/bnxt_rxr.c
index
153ca93
..
604aa09
100644
(file)
--- a/
drivers/net/bnxt/bnxt_rxr.c
+++ b/
drivers/net/bnxt/bnxt_rxr.c
@@
-75,7
+75,7
@@
static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
rx_buf->mbuf = data;
rx_buf->mbuf = data;
- rxbd->addr = rte_cpu_to_le_64(
RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf
));
+ rxbd->addr = rte_cpu_to_le_64(
rte_mbuf_data_dma_addr_default(data
));
return 0;
}
return 0;
}
@@
-102,7
+102,7
@@
static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
rx_buf->mbuf = data;
rx_buf->mbuf = data;
- rxbd->addr = rte_cpu_to_le_64(
RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf
));
+ rxbd->addr = rte_cpu_to_le_64(
rte_mbuf_data_dma_addr_default(data
));
return 0;
}
return 0;
}
@@
-123,7
+123,7
@@
static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr,
prod_bd = &rxr->rx_desc_ring[prod];
prod_bd = &rxr->rx_desc_ring[prod];
- prod_bd->addr = rte_cpu_to_le_64(
RTE_MBUF_DATA_DMA_ADDR
(mbuf));
+ prod_bd->addr = rte_cpu_to_le_64(
rte_mbuf_data_dma_addr_default
(mbuf));
rxr->rx_prod = prod;
}
rxr->rx_prod = prod;
}
@@
-199,7
+199,7
@@
static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,
if (tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
if (tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
- mbuf->ol_flags |= PKT_RX_VLAN
_PKT
;
+ mbuf->ol_flags |= PKT_RX_VLAN;
}
if (likely(tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_L4_CS_CALC)))
}
if (likely(tpa_start1->flags2 &
rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_L4_CS_CALC)))
@@
-410,12
+410,12
@@
static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
cpr->valid);
cmp_type = CMP_TYPE(rxcmp);
cpr->valid);
cmp_type = CMP_TYPE(rxcmp);
- if (cmp_type == RX_
PKT_CMPL_TYPE_RX_L2
_TPA_START) {
+ if (cmp_type == RX_
TPA_START_CMPL_TYPE_RX
_TPA_START) {
bnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp,
(struct rx_tpa_start_cmpl_hi *)rxcmp1);
rc = -EINVAL; /* Continue w/o new mbuf */
goto next_rx;
bnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp,
(struct rx_tpa_start_cmpl_hi *)rxcmp1);
rc = -EINVAL; /* Continue w/o new mbuf */
goto next_rx;
- } else if (cmp_type == RX_
PKT_CMPL_TYPE_RX_L2
_TPA_END) {
+ } else if (cmp_type == RX_
TPA_END_CMPL_TYPE_RX
_TPA_END) {
mbuf = bnxt_tpa_end(rxq, &tmp_raw_cons,
(struct rx_tpa_end_cmpl *)rxcmp,
(struct rx_tpa_end_cmpl_hi *)rxcmp1);
mbuf = bnxt_tpa_end(rxq, &tmp_raw_cons,
(struct rx_tpa_end_cmpl *)rxcmp,
(struct rx_tpa_end_cmpl_hi *)rxcmp1);
@@
-437,11
+437,12
@@
static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
cons = rxcmp->opaque;
mbuf = bnxt_consume_rx_buf(rxr, cons);
cons = rxcmp->opaque;
mbuf = bnxt_consume_rx_buf(rxr, cons);
- rte_prefetch0(mbuf);
-
if (mbuf == NULL)
return -EBUSY;
if (mbuf == NULL)
return -EBUSY;
+ rte_prefetch0(mbuf);
+
+ mbuf->data_off = RTE_PKTMBUF_HEADROOM;
mbuf->nb_segs = 1;
mbuf->next = NULL;
mbuf->pkt_len = rxcmp->len;
mbuf->nb_segs = 1;
mbuf->next = NULL;
mbuf->pkt_len = rxcmp->len;
@@
-464,7
+465,7
@@
static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
(RX_PKT_CMPL_METADATA_VID_MASK |
RX_PKT_CMPL_METADATA_DE |
RX_PKT_CMPL_METADATA_PRI_MASK);
(RX_PKT_CMPL_METADATA_VID_MASK |
RX_PKT_CMPL_METADATA_DE |
RX_PKT_CMPL_METADATA_PRI_MASK);
- mbuf->ol_flags |= PKT_RX_VLAN
_PKT
;
+ mbuf->ol_flags |= PKT_RX_VLAN;
}
if (likely(RX_CMP_IP_CS_OK(rxcmp1)))
}
if (likely(RX_CMP_IP_CS_OK(rxcmp1)))