Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43cee2d2 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: mv643xx_eth: Be drop monitor friendly 



txq_reclaim() does the normal transmit queue reclamation and
rxq_deinit() does the RX ring cleanup, none of these are packet drops,
so use dev_consume_skb() for both locations.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e9d8e7a

drivers/net/ethernet/marvell/mv643xx_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force) 
			struct sk_buff *skb = __skb_dequeue(&txq->tx_skb);



			if (!WARN_ON(!skb))

				dev_kfree_skb(skb);

				dev_consume_skb_any(skb);

		}



		if (cmd_sts & ERROR_SUMMARY) {
@@ -2024,7 +2024,7 @@ static void rxq_deinit(struct rx_queue *rxq) 


	for (i = 0; i < rxq->rx_ring_size; i++) {

		if (rxq->rx_skb[i]) {

			dev_kfree_skb(rxq->rx_skb[i]);

			dev_consume_skb_any(rxq->rx_skb[i]);

			rxq->rx_desc_count--;

		}

	}