aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJeff Moyer <jmoyer@redhat.com>2005-08-11 19:23:50 -0700
committerDavid S. Miller <davem@davemloft.net>2005-08-11 19:23:50 -0700
commita636e1357911afdea7c8344ee65f78d36caf3c16 (patch)
tree644495567b6a66d29116e0831a96198d82d788e9 /net
parent11513128bb66b0b09d5d0df069b58afdb01752a2 (diff)
[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>
Diffstat (limited to 'net')
-rw-r--r--net/core/netpoll.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 895f3efc65a..b9d9da082af 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -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;