Commit a636e135 authored Aug 11, 2005 by Jeff Moyer Committed by David S. Miller Aug 11, 2005

[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 <jmoyer@redhat.com>
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 11513128

net/core/netpoll.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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;