Imported Upstream version 16.07.2

[deb_dpdk.git] / drivers / net / enic / enic_rxtx.c

diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 2f4a08c..ad59613 100644 (file)
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -212,9 +212,12 @@ enic_cq_rx_to_pkt_flags(struct cq_desc *cqd, struct rte_mbuf *mbuf)
        /* checksum flags */
        if (!enic_cq_rx_desc_csum_not_calc(cqrd) &&
                (mbuf->packet_type & RTE_PTYPE_L3_IPV4)) {
+               uint32_t l4_flags = mbuf->packet_type & RTE_PTYPE_L4_MASK;
+
                if (unlikely(!enic_cq_rx_desc_ipv4_csum_ok(cqrd)))
                        pkt_flags |= PKT_RX_IP_CKSUM_BAD;
-               if (mbuf->packet_type & (RTE_PTYPE_L4_UDP | RTE_PTYPE_L4_TCP)) {
+               if (l4_flags == RTE_PTYPE_L4_UDP ||
+                   l4_flags == RTE_PTYPE_L4_TCP) {
                        if (unlikely(!enic_cq_rx_desc_tcp_udp_csum_ok(cqrd)))
                                pkt_flags |= PKT_RX_L4_CKSUM_BAD;
                }
@@ -300,6 +303,7 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                        (struct cq_enet_rq_desc *)&cqd);
 
                /* Push descriptor for newly allocated mbuf */
+               nmb->data_off = RTE_PKTMBUF_HEADROOM;
                dma_addr = (dma_addr_t)(nmb->buf_physaddr +
                                        RTE_PKTMBUF_HEADROOM);
                rq_enet_desc_enc(rqd_ptr, dma_addr,
@@ -398,7 +402,14 @@ static inline void enic_free_wq_bufs(struct vnic_wq *wq, u16 completed_index)
        pool = ((struct rte_mbuf *)buf->mb)->pool;
        for (i = 0; i < nb_to_free; i++) {
                buf = &wq->bufs[tail_idx];
-               m = (struct rte_mbuf *)(buf->mb);
+               m = __rte_pktmbuf_prefree_seg((struct rte_mbuf *)(buf->mb));
+               buf->mb = NULL;
+
+               if (unlikely(m == NULL)) {
+                       tail_idx = enic_ring_incr(desc_count, tail_idx);
+                       continue;
+               }
+
                if (likely(m->pool == pool)) {
                        RTE_ASSERT(nb_free < ENIC_MAX_WQ_DESCS);
                        free[nb_free++] = m;
@@ -409,7 +420,6 @@ static inline void enic_free_wq_bufs(struct vnic_wq *wq, u16 completed_index)
                        pool = m->pool;
                }
                tail_idx = enic_ring_incr(desc_count, tail_idx);
-               buf->mb = NULL;
        }
 
        rte_mempool_put_bulk(pool, (void **)free, nb_free);