Commit a9478e38 authored by Denis Kirjanov's avatar Denis Kirjanov Committed by David S. Miller

sundance: Use dev_kfree_skb_any() helper

Use dev_kfree_skb_any() helper to free the skb
Signed-off-by: default avatarDenis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d91dc279
...@@ -1116,7 +1116,6 @@ reset_tx (struct net_device *dev) ...@@ -1116,7 +1116,6 @@ reset_tx (struct net_device *dev)
void __iomem *ioaddr = np->base; void __iomem *ioaddr = np->base;
struct sk_buff *skb; struct sk_buff *skb;
int i; int i;
int irq = in_interrupt();
/* Reset tx logic, TxListPtr will be cleaned */ /* Reset tx logic, TxListPtr will be cleaned */
iowrite16 (TxDisable, ioaddr + MACCtrl1); iowrite16 (TxDisable, ioaddr + MACCtrl1);
...@@ -1131,10 +1130,7 @@ reset_tx (struct net_device *dev) ...@@ -1131,10 +1130,7 @@ reset_tx (struct net_device *dev)
dma_unmap_single(&np->pci_dev->dev, dma_unmap_single(&np->pci_dev->dev,
le32_to_cpu(np->tx_ring[i].frag[0].addr), le32_to_cpu(np->tx_ring[i].frag[0].addr),
skb->len, DMA_TO_DEVICE); skb->len, DMA_TO_DEVICE);
if (irq) dev_kfree_skb_any(skb);
dev_kfree_skb_irq (skb);
else
dev_kfree_skb (skb);
np->tx_skbuff[i] = NULL; np->tx_skbuff[i] = NULL;
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment