From: Roy Marples <roy@marples.name>
Date: Fri, 10 Oct 2014 09:13:32 +0000 (+0000)
Subject: Now ARP checks all interfaces for false positives, we can check ARP again.
X-Git-Tag: v6.5.1~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34e61f88e24a259e06cf7aa3ef5f6650be3932f9;p=thirdparty%2Fdhcpcd.git

Now ARP checks all interfaces for false positives, we can check ARP again.
---

diff --git a/dhcp.c b/dhcp.c
index ccc94b1f..38692dc0 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -2565,7 +2565,7 @@ dhcp_handledhcp(struct interface *iface, struct dhcp_message **dhcpp,
 		/* If the interface already has the address configured
 		 * then we can't ARP for duplicate detection. */
 		addr.s_addr = state->offer->yiaddr;
-		if (!ipv4_findaddr(iface->ctx, &addr)) {
+		if (!ipv4_iffindaddr(iface, &addr, NULL)) {
 			state->claims = 0;
 			state->probes = 0;
 			state->conflicts = 0;