diff options
| author |   Denis Kirjanov <dkirjanov@kernel.org> | 2010-09-20 22:57:49 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-09-21 18:04:46 -0700 |
| commit | a9478e386165477504916094ae5efb073a44fd9f (patch) | |
| tree | f03126b3a23ad209345e3e440351b3b61dd0f9ec /drivers/net/sundance.c | |
| parent | sundance: Handle DMA mapping errors (diff) | |
| download | linux-dev-a9478e386165477504916094ae5efb073a44fd9f.tar.xz linux-dev-a9478e386165477504916094ae5efb073a44fd9f.zip | |
sundance: Use dev_kfree_skb_any() helper
Use dev_kfree_skb_any() helper to free the skb
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sundance.c')
| -rw-r--r-- | drivers/net/sundance.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index 0df8a2c23592..8b5aeca24d5d 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c @@ -1116,7 +1116,6 @@ reset_tx (struct net_device *dev) void __iomem *ioaddr = np->base; struct sk_buff *skb; int i; - int irq = in_interrupt(); /* Reset tx logic, TxListPtr will be cleaned */ iowrite16 (TxDisable, ioaddr + MACCtrl1); @@ -1131,10 +1130,7 @@ reset_tx (struct net_device *dev) dma_unmap_single(&np->pci_dev->dev, le32_to_cpu(np->tx_ring[i].frag[0].addr), skb->len, DMA_TO_DEVICE); - if (irq) - dev_kfree_skb_irq (skb); - else - dev_kfree_skb (skb); + dev_kfree_skb_any(skb); np->tx_skbuff[i] = NULL; dev->stats.tx_dropped++; } |