Commit 7f7183af authored by Matteo Croce's avatar Matteo Croce Committed by David S. Miller
Browse files

mvpp2: refactor frame drop routine 



Move some code down to remove a backward goto.

Signed-off-by: default avatarMatteo Croce <mcroce@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent faf7b8b2

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+9 −8
Original line number Diff line number Diff line
@@ -2956,14 +2956,8 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, 
		 * by the hardware, and the information about the buffer is

		 * comprised by the RX descriptor.

		 */

		if (rx_status & MVPP2_RXD_ERR_SUMMARY) {

err_drop_frame:

			dev->stats.rx_errors++;

			mvpp2_rx_error(port, rx_desc);

			/* Return the buffer to the pool */

			mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr);

			continue;

		}

		if (rx_status & MVPP2_RXD_ERR_SUMMARY)

			goto err_drop_frame;



		if (bm_pool->frag_size > PAGE_SIZE)

			frag_size = 0;
@@ -2994,6 +2988,13 @@ err_drop_frame: 
		mvpp2_rx_csum(port, rx_status, skb);



		napi_gro_receive(napi, skb);

		continue;



err_drop_frame:

		dev->stats.rx_errors++;

		mvpp2_rx_error(port, rx_desc);

		/* Return the buffer to the pool */

		mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr);

	}



	if (rcvd_pkts) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE