---

yaml --- r: 135182 b: refs/heads/master c: 73ce7b0 h: refs/heads/master v: v3
git-mirror · Mar 13, 2009 · e024214 · e024214
1 parent 310a2b8
commit e024214
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8ae0a21d83f43006d7f6d2862e921dbf2eeddd
+refs/heads/master: 73ce7b01b4496a5fbf9caf63033c874be692333f
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
@@ -801,8 +801,11 @@ static int arp_process(struct sk_buff *skb)
  *  cache.
  */
 
-	/* Special case: IPv4 duplicate address detection packet (RFC2131) */
-	if (sip == 0) {
+	/*
+	 *  Special case: IPv4 duplicate address detection packet (RFC2131)
+	 *  and Gratuitous ARP/ARP Announce. (RFC3927, Section 2.4)
+	 */
+	if (sip == 0 || tip == sip) {
 		if (arp->ar_op == htons(ARPOP_REQUEST) &&
 		    inet_addr_type(net, tip) == RTN_LOCAL &&
 		    !arp_ignore(in_dev, sip, tip))