Commit 70d9d158 authored by Will Newton's avatar Will Newton Committed by Jeff Garzik

drivers/net/smc911x.c: Fix lockdep warning on xmit.

dev_kfree_skb should not be called with irqs disabled, use dev_kfree_skb_irq
instead. The warning caused looks like this:

======================================================
[ INFO: hard-safe -> hard-unsafe lock order detected ]
2.6.28-rc1 #273
------------------------------------------------------
swapper/0 [HC0[0]:SC1[2]:HE0:SE0] is trying to acquire:
 (clock-AF_INET){-..+}, at: [<4015c17c>] _sock_def_write_space+0x28/0xd8

and this task is already holding:
 (&lp->lock){++..}, at: [<4013f230>] _smc911x_hard_start_xmit+0x30/0x4b8
which would create a new lock dependency:
 (&lp->lock){++..} -> (clock-AF_INET){-..+}
Signed-off-by: default avatarWill Newton <will.newton@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 48dcc33e
...@@ -499,7 +499,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev) ...@@ -499,7 +499,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev)
#else #else
SMC_PUSH_DATA(lp, buf, len); SMC_PUSH_DATA(lp, buf, len);
dev->trans_start = jiffies; dev->trans_start = jiffies;
dev_kfree_skb(skb); dev_kfree_skb_irq(skb);
#endif #endif
if (!lp->tx_throttle) { if (!lp->tx_throttle) {
netif_wake_queue(dev); netif_wake_queue(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment