Error check needs to be done only for last segment of Jumbo packet.
Freed first_seg and reset eop to 0 in error case

Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")

Signed-off-by: Bhagyada Modali <bhagyada.mod...@amd.com>
---
 drivers/net/axgbe/axgbe_rxtx.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index f38bb64fab..6909d3a852 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -381,19 +381,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
                }
 
                mbuf = rxq->sw_ring[idx];
-               /* Check for any errors and free mbuf*/
-               err = AXGMAC_GET_BITS_LE(desc->write.desc3,
-                                        RX_NORMAL_DESC3, ES);
-               error_status = 0;
-               if (unlikely(err)) {
-                       error_status = desc->write.desc3 & AXGBE_ERR_STATUS;
-                       if ((error_status != AXGBE_L3_CSUM_ERR)
-                                       && (error_status != AXGBE_L4_CSUM_ERR)) 
{
-                               rxq->errors++;
-                               rte_pktmbuf_free(mbuf);
-                               goto err_set;
-                       }
-               }
                rte_prefetch1(rte_pktmbuf_mtod(mbuf, void *));
 
                if (!AXGMAC_GET_BITS_LE(desc->write.desc3,
@@ -406,6 +393,25 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
                        pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3,
                                        RX_NORMAL_DESC3, PL);
                        data_len = pkt_len - rxq->crc_len;
+                       /* Check for any errors and free mbuf*/
+                       err = AXGMAC_GET_BITS_LE(desc->write.desc3,
+                                       RX_NORMAL_DESC3, ES);
+                       error_status = 0;
+                       if (unlikely(err)) {
+                               error_status = desc->write.desc3 &
+                                       AXGBE_ERR_STATUS;
+                               if ((error_status != AXGBE_L3_CSUM_ERR) &&
+                                               (error_status !=
+                                                AXGBE_L4_CSUM_ERR)) {
+                                       rxq->errors++;
+                                       rte_pktmbuf_free(mbuf);
+                                       rte_pktmbuf_free(first_seg);
+                                       first_seg = NULL;
+                                       eop = 0;
+                                       goto err_set;
+                               }
+                       }
+
                }
 
                if (first_seg != NULL) {
-- 
2.25.1

Reply via email to