tree 644495567b6a66d29116e0831a96198d82d788e9
parent 11513128bb66b0b09d5d0df069b58afdb01752a2
author Jeff Moyer <[EMAIL PROTECTED]> Fri, 12 Aug 2005 09:23:50 -0700
committer David S. Miller <[EMAIL PROTECTED]> Fri, 12 Aug 2005 09:23:50 -0700

[NETPOLL]: deadlock bugfix

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 <[EMAIL PROTECTED]>
Signed-off-by: Matt Mackall <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>

 net/core/netpoll.c |    3 ---
 1 files changed, 3 deletions(-)

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -353,11 +353,8 @@ static void arp_reply(struct sk_buff *sk
        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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to