Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

skge: Call dev_kfree/consume_skb_any instead of dev_kfree_skb.

Browse Source 
Replace dev_kfree_skb with dev_kfree_skb_any skge_xmit_free that can
be called in hard irq and other contexts, on the path that
handles dropped packets.

Replace dev_kfree_skb with dev_consume_skb_any in skge_tx_done that can
be called in hard irq and other contexts, on the path that handles
successfully transmitted skbs.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2014-03-15 17:38:42 -07:00
parent 43f5437748
commit 0b88a8e18e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/marvell/skge.c
View File

@ -2845,7 +2845,7 @@ mapping_unwind:
mapping_error: mapping_error:
if (net_ratelimit()) if (net_ratelimit())
dev_warn(&hw->pdev->dev, "%s: tx mapping error\n", dev->name); dev_warn(&hw->pdev->dev, "%s: tx mapping error\n", dev->name);
dev_kfree_skb(skb); dev_kfree_skb_any(skb);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
@ -3172,7 +3172,7 @@ static void skge_tx_done(struct net_device *dev)
pkts_compl++; pkts_compl++;
bytes_compl += e->skb->len; bytes_compl += e->skb->len;
dev_kfree_skb(e->skb); dev_consume_skb_any(e->skb);
} }
} }
netdev_completed_queue(dev, pkts_compl, bytes_compl); netdev_completed_queue(dev, pkts_compl, bytes_compl);