From b67b7e7875652d340e6619be5f30c3c8c4aa8cc6 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 3 Oct 2005 14:18:10 -0700
Subject: [PATCH] --- yaml --- r: 9572 b: refs/heads/master c:
 444fc8fc3a1f926fa224655b8950bd853368c1a3 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/net/ipv4/arp.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5057c0cf3306..26c6de18d5d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 496a22b08fa326bf17c11eb900e0505aa9da3506
+refs/heads/master: 444fc8fc3a1f926fa224655b8950bd853368c1a3
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index 8bf312bdea13..ec0e36893b01 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/net/ipv4/arp.c
@@ -697,12 +697,6 @@ void arp_send(int type, int ptype, u32 dest_ip,
 	arp_xmit(skb);
 }
 
-static void parp_redo(struct sk_buff *skb)
-{
-	nf_reset(skb);
-	arp_rcv(skb, skb->dev, NULL, skb->dev);
-}
-
 /*
  *	Process an arp request.
  */
@@ -922,6 +916,11 @@ static int arp_process(struct sk_buff *skb)
 	return 0;
 }
 
+static void parp_redo(struct sk_buff *skb)
+{
+	arp_process(skb);
+}
+
 
 /*
  *	Receive an arp request from the device layer.