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

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

net: bcmgenet: Be drop monitor friendly 



There are 3 spots where we call dev_kfree_skb() but we are actually
just doing a normal SKB consumption: __bcmgenet_tx_reclaim() for normal
TX reclamation, bcmgenet_alloc_rx_buffers() during the initial RX ring
setup and bcmgenet_free_rx_buffers() during RX ring cleanup.

Fixes: d6707bec ("net: bcmgenet: rewrite bcmgenet_rx_refill()")
Fixes: f48bed16 ("net: bcmgenet: Free skb after last Tx frag")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e458deb

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

+3 −3
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev, 
		if (skb) {

			pkts_compl++;

			bytes_compl += GENET_CB(skb)->bytes_sent;

			dev_kfree_skb_any(skb);

			dev_consume_skb_any(skb);

		}



		txbds_processed++;
@@ -1875,7 +1875,7 @@ static int bcmgenet_alloc_rx_buffers(struct bcmgenet_priv *priv, 
		cb = ring->cbs + i;

		skb = bcmgenet_rx_refill(priv, cb);

		if (skb)

			dev_kfree_skb_any(skb);

			dev_consume_skb_any(skb);

		if (!cb->skb)

			return -ENOMEM;

	}
@@ -1894,7 +1894,7 @@ static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv) 


		skb = bcmgenet_free_rx_cb(&priv->pdev->dev, cb);

		if (skb)

			dev_kfree_skb_any(skb);

			dev_consume_skb_any(skb);

	}

}