summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-16 02:03:36 +0100
committerEric W. Biederman <ebiederm@xmission.com>2014-03-25 05:19:09 +0100
commit828f56f60f42783913166229f7192004d3d095ba (patch)
tree5d5a236d4af07d5a13d64961e2995db2cbb1ccd8 /drivers/net/ethernet
parentsc92031: Call dev_consume_skb_any instead of dev_kfree_skb. (diff)
downloadlinux-828f56f60f42783913166229f7192004d3d095ba.tar.xz
linux-828f56f60f42783913166229f7192004d3d095ba.zip
sis900: Call dev_kfree_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_kfree_skb_any in functions that can be called in hard irq and other contexts. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/sis/sis900.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index ff57a46388ee..6072f093e6b4 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -1614,7 +1614,7 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
skb->data, skb->len, PCI_DMA_TODEVICE);
if (unlikely(pci_dma_mapping_error(sis_priv->pci_dev,
sis_priv->tx_ring[entry].bufptr))) {
- dev_kfree_skb(skb);
+ dev_kfree_skb_any(skb);
sis_priv->tx_skbuff[entry] = NULL;
net_dev->stats.tx_dropped++;
spin_unlock_irqrestore(&sis_priv->lock, flags);