diff options
author | Will Newton <will.newton@gmail.com> | 2008-10-28 06:52:36 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-11-02 08:45:23 -0500 |
commit | 70d9d15833864e7120c3ffcfdbd6fa61f5f9726a (patch) | |
tree | 732fbeb96f7b385d0730374a94eaa17eeb2df3b6 /drivers/net | |
parent | 48dcc33e5e11de0f76b65b113988dbc930d17395 (diff) |
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: Will Newton <will.newton@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/smc911x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index f59c7772f344..5051554ff05b 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
@@ -499,7 +499,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev) | |||
499 | #else | 499 | #else |
500 | SMC_PUSH_DATA(lp, buf, len); | 500 | SMC_PUSH_DATA(lp, buf, len); |
501 | dev->trans_start = jiffies; | 501 | dev->trans_start = jiffies; |
502 | dev_kfree_skb(skb); | 502 | dev_kfree_skb_irq(skb); |
503 | #endif | 503 | #endif |
504 | if (!lp->tx_throttle) { | 504 | if (!lp->tx_throttle) { |
505 | netif_wake_queue(dev); | 505 | netif_wake_queue(dev); |