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

Commit dd11680d authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David S. Miller
Browse files

net: mv643xx_eth: Count dropped packets properly 



This commit fixes the current dropped packet count by doing it properly,
increasing the count when a packet is discarded; i.e. the packet is not
processed and the driver returns NETDEV_TX_OK.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2e3173a3

drivers/net/ethernet/marvell/mv643xx_eth.c

+4 −1
Original line number Diff line number Diff line
@@ -967,7 +967,6 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
	nq = netdev_get_tx_queue(dev, queue);



	if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {

		txq->tx_dropped++;

		netdev_printk(KERN_DEBUG, dev,

			      "failed to linearize skb with tiny unaligned fragment\n");

		return NETDEV_TX_BUSY;
@@ -976,6 +975,7 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (txq->tx_ring_size - txq->tx_desc_count < MAX_SKB_FRAGS + 1) {

		if (net_ratelimit())

			netdev_err(dev, "tx queue full?!\n");

		txq->tx_dropped++;

		dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}
@@ -997,6 +997,9 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
			netif_tx_stop_queue(nq);

	} else if (ret == -EBUSY) {

		return NETDEV_TX_BUSY;

	} else {

		txq->tx_dropped++;

		dev_kfree_skb_any(skb);

	}



	return NETDEV_TX_OK;