* [PATCH -next 3/3] sundance: Use dev_kfree_skb_any() helper
@ 2010-09-21 8:57 Denis Kirjanov
2010-09-22 1:06 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Denis Kirjanov @ 2010-09-21 8:57 UTC (permalink / raw)
To: davem; +Cc: netdev
Use dev_kfree_skb_any() helper to free the skb
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
---
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 b21e961..794f33f 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1114,7 +1114,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);
@@ -1129,10 +1128,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++;
}
--
1.7.2.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next 3/3] sundance: Use dev_kfree_skb_any() helper
2010-09-21 8:57 [PATCH -next 3/3] sundance: Use dev_kfree_skb_any() helper Denis Kirjanov
@ 2010-09-22 1:06 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-09-22 1:06 UTC (permalink / raw)
To: dkirjanov; +Cc: netdev
From: Denis Kirjanov <dkirjanov@kernel.org>
Date: Tue, 21 Sep 2010 08:57:49 +0000
> Use dev_kfree_skb_any() helper to free the skb
>
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-22 1:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-21 8:57 [PATCH -next 3/3] sundance: Use dev_kfree_skb_any() helper Denis Kirjanov
2010-09-22 1:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).