summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/cadence
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-15 16:08:27 -0700
committerEric W. Biederman <ebiederm@xmission.com>2014-03-24 21:18:55 -0700
commitc88b5b6a68da1bc4353521bde95246bbc0f85b5e (patch)
tree7f9a3cf97b2d79cbc17313be574751f2dd48e58d /drivers/net/ethernet/cadence
parent27400df8e92b0e2934ef9de8eb7a08e7e490b784 (diff)
downloadtalos-obmc-linux-c88b5b6a68da1bc4353521bde95246bbc0f85b5e.tar.gz
talos-obmc-linux-c88b5b6a68da1bc4353521bde95246bbc0f85b5e.zip
macb: Call dev_kfree_skb_any instead of kfree_skb.
Replace kfree_skb with dev_kfree_skb_any in macb_start_xmit that can be called in hard irq and other contexts. macb_start_xmit only frees skbs when dropping them so dev_kfree_skb_any is used. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/cadence')
-rw-r--r--drivers/net/ethernet/cadence/macb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index d0c38e01e99f..6116887d2880 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1045,7 +1045,7 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
mapping = dma_map_single(&bp->pdev->dev, skb->data,
len, DMA_TO_DEVICE);
if (dma_mapping_error(&bp->pdev->dev, mapping)) {
- kfree_skb(skb);
+ dev_kfree_skb_any(skb);
goto unlock;
}
OpenPOWER on IntegriCloud