]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETPOLL]: deadlock bugfix
authorJeff Moyer <jmoyer@redhat.com>
Fri, 12 Aug 2005 02:23:50 +0000 (19:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Aug 2005 02:23:50 +0000 (19:23 -0700)
This fixes an obvious deadlock in the netpoll code.  netpoll_rx takes the
npinfo->rx_lock.  netpoll_rx is also the only caller of arp_reply (through
__netpoll_rx).  As such, it is not necessary to take this lock.

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/netpoll.c

index 895f3efc65aac7e5ee2c1dc9425af42d3e71d839..b9d9da082af2bc81427d8c36ebff33a433b418db 100644 (file)
@@ -353,11 +353,8 @@ static void arp_reply(struct sk_buff *skb)
        struct sk_buff *send_skb;
        struct netpoll *np = NULL;
 
-       spin_lock_irqsave(&npinfo->rx_lock, flags);
        if (npinfo->rx_np && npinfo->rx_np->dev == skb->dev)
                np = npinfo->rx_np;
-       spin_unlock_irqrestore(&npinfo->rx_lock, flags);
-
        if (!np)
                return;