Skip to content

Commit

Permalink
net: bcmgenet: Be drop monitor friendly
Browse files Browse the repository at this point in the history
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: d6707be ("net: bcmgenet: rewrite bcmgenet_rx_refill()")
Fixes: f48bed1 ("net: bcmgenet: Free skb after last Tx frag")
Signed-off-by: Florian Fainelli <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
ffainelli authored and davem330 committed Aug 25, 2017
1 parent 4e458de commit d4fec85
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/broadcom/genet/bcmgenet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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);
}
}

Expand Down

0 comments on commit d4fec85

Please sign in to comment.