Commit a636e135 authored by Jeff Moyer's avatar Jeff Moyer Committed by David S. Miller

[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: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 11513128
...@@ -353,11 +353,8 @@ static void arp_reply(struct sk_buff *skb) ...@@ -353,11 +353,8 @@ static void arp_reply(struct sk_buff *skb)
struct sk_buff *send_skb; struct sk_buff *send_skb;
struct netpoll *np = NULL; struct netpoll *np = NULL;
spin_lock_irqsave(&npinfo->rx_lock, flags);
if (npinfo->rx_np && npinfo->rx_np->dev == skb->dev) if (npinfo->rx_np && npinfo->rx_np->dev == skb->dev)
np = npinfo->rx_np; np = npinfo->rx_np;
spin_unlock_irqrestore(&npinfo->rx_lock, flags);
if (!np) if (!np)
return; return;
......
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