From: Roy Marples <roy@marples.name>
Date: Fri, 30 May 2008 10:27:15 +0000 (+0000)
Subject: Kernel will send the 2nd annoucemnent when we add the address.
X-Git-Tag: v4.0.2~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fa019426f2e5cb8bfd143f227f91ae41d2822c8;p=thirdparty%2Fdhcpcd.git

Kernel will send the 2nd annoucemnent when we add the address.
---

diff --git a/net.c b/net.c
index 5f74ac6c..7b3f73b1 100644
--- a/net.c
+++ b/net.c
@@ -715,12 +715,17 @@ arp_claim(struct interface *iface, struct in_addr address)
 			} else if (nclaims < ANNOUNCE_NUM) {
 				nclaims++;
 				timeout = ANNOUNCE_INTERVAL;
-				logger(LOG_DEBUG, "sending ARP claim #%d",
-				       nclaims);
-				if (send_arp(iface, ARPOP_REQUEST,
-					     address, iface->hwaddr,
-					     address) == -1)
-					break;
+				/* Kernel will send the last ARP when we add
+				 * the address. */
+				if (nclaims < ANNOUNCE_NUM) {
+					logger(LOG_DEBUG,
+					       "sending ARP claim #%d",
+					       nclaims);
+					if (send_arp(iface, ARPOP_REQUEST,
+						     address, iface->hwaddr,
+						     address) == -1)
+						break;
+				}
 			} else {
 				/* No replies, so done */
 				retval = 0;