summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Vlasenko <vda@ilport.com.ua>2005-06-21 00:33:04 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 00:37:26 +0200
commit400de2c0c4f4a2cc2e0270353e7eb512c1899a0c (patch)
tree341337d31861dda1918da65da8f82ecd4f8f35ee
parent[PATCH] fix int vs. pm_message_t confusion in airo (diff)
downloadlinux-400de2c0c4f4a2cc2e0270353e7eb512c1899a0c.tar.xz
linux-400de2c0c4f4a2cc2e0270353e7eb512c1899a0c.zip
[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)
if (cur->skbuff) {
pci_unmap_single(np->pci_dev, cur->buffer,
cur->skbuff->len, PCI_DMA_TODEVICE);
- dev_kfree_skb(cur->skbuff);
- /* or dev_kfree_skb_irq(cur->skbuff); ? */
+ dev_kfree_skb_any(cur->skbuff);
cur->skbuff = NULL;
}
cur->status = 0;