From 68397dd87386d4cdbff91491ae5165cedf7d8269 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Mon, 20 Sep 2010 22:57:49 +0000 Subject: [PATCH] --- yaml --- r: 214602 b: refs/heads/master c: a9478e386165477504916094ae5efb073a44fd9f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sundance.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2f2674b2838e..77b60915ed9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d91dc27993a366565b3ed37fc62d35cf3e10ff5d +refs/heads/master: a9478e386165477504916094ae5efb073a44fd9f diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c index 0df8a2c23592..8b5aeca24d5d 100644 --- a/trunk/drivers/net/sundance.c +++ b/trunk/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++; }