From: Denis Vlasenko Signed-off-by: Andrew Morton --- drivers/net/fealnx.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/net/fealnx.c~fealnxc-calls-dev_kfree_skb-from-atomic-context-fix-it drivers/net/fealnx.c --- 25/drivers/net/fealnx.c~fealnxc-calls-dev_kfree_skb-from-atomic-context-fix-it 2005-06-17 01:10:11.000000000 -0700 +++ 25-akpm/drivers/net/fealnx.c 2005-06-17 01:10:11.000000000 -0700 @@ -1423,8 +1423,7 @@ static void reset_tx_descriptors(struct 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; _