]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
sundance: Use dev_kfree_skb_any() helper
authorDenis Kirjanov <dkirjanov@kernel.org>
Mon, 20 Sep 2010 22:57:49 +0000 (22:57 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Sep 2010 01:04:46 +0000 (18:04 -0700)
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>
drivers/net/sundance.c

index 0df8a2c235922f6940fae6a328f5ff1819fe4c78..8b5aeca24d5db9860f3e027a899746afece41e8a 100644 (file)
@@ -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++;
                }