From 6e64477ad770f755b87cda1a0f68ae48072c5dd7 Mon Sep 17 00:00:00 2001
From: Jonas Danielsson <the.sator@gmail.com>
Date: Tue, 20 Nov 2007 17:38:16 -0800
Subject: [PATCH] --- yaml --- r: 74214 b: refs/heads/master c:
 b4a9811c42ecb70b2f0b375f6d4c77ab34d1f598 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e2e0cc1c3246..e3cfc78fc622 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77adefdc9863d63f8d8bdc6a9adcdf9a6b0e2410
+refs/heads/master: b4a9811c42ecb70b2f0b375f6d4c77ab34d1f598
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index 36d6798947b5..15ca729f7084 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/net/ipv4/arp.c
@@ -828,7 +828,8 @@ static int arp_process(struct sk_buff *skb)
 		if (arp->ar_op == htons(ARPOP_REQUEST) &&
 		    inet_addr_type(tip) == RTN_LOCAL &&
 		    !arp_ignore(in_dev,dev,sip,tip))
-			arp_send(ARPOP_REPLY,ETH_P_ARP,tip,dev,tip,sha,dev->dev_addr,dev->dev_addr);
+			arp_send(ARPOP_REPLY, ETH_P_ARP, sip, dev, tip, sha,
+				 dev->dev_addr, sha);
 		goto out;
 	}