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

Commit c590032f authored by Petri Gynther's avatar Petri Gynther Committed by David S. Miller
Browse files

net: bcmgenet: fix accounting of packet drops vs errors 



bcmgenet driver needs to separate packet drops from packet errors.

When the driver has to drop a *good* packet, due to lack of buffers or
replacement skbs, increment only dev->stats.[rx|tx]_dropped.

When the driver encounters a bad Rx packet or Tx error, increment only
dev->stats.[rx|tx]_errors + relevant detailed error counter.

Signed-off-by: default avatarPetri Gynther <pgynther@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22401ff1

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+0 −4
Original line number Diff line number Diff line
@@ -1230,7 +1230,6 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev, 
		new_skb = skb_realloc_headroom(skb, sizeof(*status));

		dev_kfree_skb(skb);

		if (!new_skb) {

			dev->stats.tx_errors++;

			dev->stats.tx_dropped++;

			return NULL;

		}
@@ -1465,7 +1464,6 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring, 


		if (unlikely(!skb)) {

			dev->stats.rx_dropped++;

			dev->stats.rx_errors++;

			goto next;

		}
@@ -1493,7 +1491,6 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring, 
		if (unlikely(!(dma_flag & DMA_EOP) || !(dma_flag & DMA_SOP))) {

			netif_err(priv, rx_status, dev,

				  "dropping fragmented packet!\n");

			dev->stats.rx_dropped++;

			dev->stats.rx_errors++;

			dev_kfree_skb_any(skb);

			goto next;
@@ -1515,7 +1512,6 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring, 
				dev->stats.rx_frame_errors++;

			if (dma_flag & DMA_RX_LG)

				dev->stats.rx_length_errors++;

			dev->stats.rx_dropped++;

			dev->stats.rx_errors++;

			dev_kfree_skb_any(skb);

			goto next;