diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2017-08-24 20:55:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-24 21:27:09 -0700 |
| commit | 43cee2d2465cab8289dc1d9206b90fcf975a604f (patch) | |
| tree | 1841b5a9a13935fde70db56bea515100dae88474 /drivers/net/ethernet/marvell | |
| parent | 1e9d8e7ad3acd379d071e276f930f39bdebe3727 (diff) | |
| download | linux-43cee2d2465cab8289dc1d9206b90fcf975a604f.tar.gz linux-43cee2d2465cab8289dc1d9206b90fcf975a604f.tar.bz2 linux-43cee2d2465cab8289dc1d9206b90fcf975a604f.zip | |
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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index fb2d533ae4ef..81c1fac00d33 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -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--; } } |