From: Roy Marples <roy@marples.name>
Date: Tue, 1 Oct 2019 16:01:49 +0000 (+0100)
Subject: inet: Either call the IPv4LL handler or the DHCP handler - not both
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=478f86a9a57aed791037dcfd8b2c4276b41fbfe9;p=thirdparty%2Fdhcpcd.git

inet: Either call the IPv4LL handler or the DHCP handler - not both
---

diff --git a/src/ipv4.c b/src/ipv4.c
index 05fc8066..544432ab 100644
--- a/src/ipv4.c
+++ b/src/ipv4.c
@@ -936,10 +936,14 @@ ipv4_handleifa(struct dhcpcd_ctx *ctx,
 	}
 
 	if (addr->s_addr != INADDR_ANY && addr->s_addr != INADDR_BROADCAST) {
-		dhcp_handleifa(cmd, ia, pid);
+		if (IN_LINKLOCAL(addr->s_addr))
 #ifdef IPV4LL
-		ipv4ll_handleifa(cmd, ia, pid);
+			ipv4ll_handleifa(cmd, ia, pid);
+#else
+			;
 #endif
+		else
+			dhcp_handleifa(cmd, ia, pid);
 	}
 
 	if (cmd == RTM_DELADDR)