---

yaml --- r: 74214 b: refs/heads/master c: b4a9811 h: refs/heads/master v: v3
git-mirror · Nov 21, 2007 · 6e64477 · 6e64477
1 parent 1e292ca
commit 6e64477
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 	}