aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-12-01 14:29:36 -0800
committerJeff Garzik <jeff@garzik.org>2006-12-02 00:22:29 -0500
commit794b2bd20f620892616b09466186ff27101d9e5b (patch)
treeecf177aef4fbbd8d6ac4b6b59c25ad950e0b21aa /drivers/net
parent8df9a87604e38529898ce35c610792c03c8713a2 (diff)
[PATCH] sky2: kfree_skb_any needed
It is possible for the sky2 driver NAPI poll routine to be called with IRQ's disabled if netpoll is trying to make space in the tx queue. This is an obscure path, but if it happens, the kfree_skb needs to happen via softirq. Calling kfree_skb with IRQ's disabled is a not allowed. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 71722f53f2b..b95b9b7cce0 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1453,7 +1453,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
if (unlikely(netif_msg_tx_done(sky2)))
printk(KERN_DEBUG "%s: tx done %u\n",
dev->name, idx);
- dev_kfree_skb(re->skb);
+ dev_kfree_skb_any(re->skb);
}
le->opcode = 0; /* paranoia */