aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Vlasenko <vda@ilport.com.ua>2005-06-20 18:33:04 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-26 18:37:26 -0400
commit400de2c0c4f4a2cc2e0270353e7eb512c1899a0c (patch)
tree341337d31861dda1918da65da8f82ecd4f8f35ee
parent1cc68ae0cf9e3384d9eef6985b312bf2bf1161b3 (diff)
[PATCH] fealnx.c calls dev_kfree_skb from atomic context
Signed-off-by: Andrew Morton <akpm@osdl.org>
-rw-r--r--drivers/net/fealnx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index d05e9dd1e140..9e0303f6d73c 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1423,8 +1423,7 @@ static void reset_tx_descriptors(struct net_device *dev)
1423 if (cur->skbuff) { 1423 if (cur->skbuff) {
1424 pci_unmap_single(np->pci_dev, cur->buffer, 1424 pci_unmap_single(np->pci_dev, cur->buffer,
1425 cur->skbuff->len, PCI_DMA_TODEVICE); 1425 cur->skbuff->len, PCI_DMA_TODEVICE);
1426 dev_kfree_skb(cur->skbuff); 1426 dev_kfree_skb_any(cur->skbuff);
1427 /* or dev_kfree_skb_irq(cur->skbuff); ? */
1428 cur->skbuff = NULL; 1427 cur->skbuff = NULL;
1429 } 1428 }
1430 cur->status = 0; 1429 cur->status = 0;