New upstream version 18.11.2

[deb_dpdk.git] / drivers / net / qede / qede_rxtx.c

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index eda19b2..27bac09 100644 (file)
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -1420,13 +1420,6 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        uint32_t rss_hash;
        int rx_alloc_count = 0;
 
-       hw_comp_cons = rte_le_to_cpu_16(*rxq->hw_cons_ptr);
-       sw_comp_cons = ecore_chain_get_cons_idx(&rxq->rx_comp_ring);
-
-       rte_rmb();
-
-       if (hw_comp_cons == sw_comp_cons)
-               return 0;
 
        /* Allocate buffers that we used in previous loop */
        if (rxq->rx_alloc_count) {
@@ -1447,6 +1440,14 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                rxq->rx_alloc_count = 0;
        }
 
+       hw_comp_cons = rte_le_to_cpu_16(*rxq->hw_cons_ptr);
+       sw_comp_cons = ecore_chain_get_cons_idx(&rxq->rx_comp_ring);
+
+       rte_rmb();
+
+       if (hw_comp_cons == sw_comp_cons)
+               return 0;
+
        while (sw_comp_cons != hw_comp_cons) {
                ol_flags = 0;
                packet_type = RTE_PTYPE_UNKNOWN;
@@ -1819,7 +1820,7 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts,
                                    temp == PKT_TX_TUNNEL_GENEVE ||
                                    temp == PKT_TX_TUNNEL_MPLSINUDP ||
                                    temp == PKT_TX_TUNNEL_GRE)
-                                       break;
+                                       continue;
                        }
 
                        rte_errno = -ENOTSUP;