summaryrefslogtreecommitdiffstats
path: root/dpdk/dpdk-2.2.0_patches/0016-enic-fix-mbuf-flags-on-Rx.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dpdk/dpdk-2.2.0_patches/0016-enic-fix-mbuf-flags-on-Rx.patch')
-rw-r--r--dpdk/dpdk-2.2.0_patches/0016-enic-fix-mbuf-flags-on-Rx.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/dpdk/dpdk-2.2.0_patches/0016-enic-fix-mbuf-flags-on-Rx.patch b/dpdk/dpdk-2.2.0_patches/0016-enic-fix-mbuf-flags-on-Rx.patch
new file mode 100644
index 00000000000..e8f74db5bf6
--- /dev/null
+++ b/dpdk/dpdk-2.2.0_patches/0016-enic-fix-mbuf-flags-on-Rx.patch
@@ -0,0 +1,38 @@
+commit 3253bbc79c8a1eddf791d9ec11bcea4a004d258e
+Author: John Daley <johndale@cisco.com>
+Date: Thu Mar 17 15:57:05 2016 -0700
+
+ enic: fix mbuf flags on Rx
+
+ In the receive path, the function to set mbuf ol_flags used the
+ mbuf packet_type before it was set.
+
+ Fixes: 947d860c821f ("enic: improve Rx performance")
+
+ Signed-off-by: John Daley <johndale@cisco.com>
+
+diff --git a/drivers/net/enic/enic_rx.c b/drivers/net/enic/enic_rx.c
+index 945a60f..59ebaa4 100644
+--- a/drivers/net/enic/enic_rx.c
++++ b/drivers/net/enic/enic_rx.c
+@@ -210,7 +210,7 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf)
+ ciflags = enic_cq_rx_desc_ciflags(cqrd);
+ bwflags = enic_cq_rx_desc_bwflags(cqrd);
+
+- ASSERT(mbuf->ol_flags == 0);
++ mbuf->ol_flags = 0;
+
+ /* flags are meaningless if !EOP */
+ if (unlikely(!enic_cq_rx_desc_eop(ciflags)))
+@@ -340,10 +340,10 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+ rxmb->pkt_len = rx_pkt_len;
+ rxmb->data_len = rx_pkt_len;
+ rxmb->port = enic->port_id;
++ rxmb->packet_type = enic_cq_rx_flags_to_pkt_type(&cqd);
+ rxmb->ol_flags = ol_err_flags;
+ if (!ol_err_flags)
+ enic_cq_rx_to_pkt_flags(&cqd, rxmb);
+- rxmb->packet_type = enic_cq_rx_flags_to_pkt_type(&cqd);
+
+ /* prefetch mbuf data for caller */
+ rte_packet_prefetch(RTE_PTR_ADD(rxmb->buf_addr,