---

yaml --- r: 214602 b: refs/heads/master c: a9478e3 h: refs/heads/master v: v3
git-mirror · Sep 22, 2010 · 68397dd · 68397dd
1 parent df6fa08
commit 68397dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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++;
 		}