Module Name:    src
Committed By:   roy
Date:           Mon Jun  4 16:45:52 UTC 2018

Modified Files:
        src/external/bsd/dhcpcd/dist/src: dhcp.c

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/src/dhcp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.10 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.11
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.10	Sat Jun  2 09:44:27 2018
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c	Mon Jun  4 16:45:52 2018
@@ -2101,8 +2101,10 @@ dhcp_arp_probed(struct arp_state *astate
 	if (ifp->ctx->options & DHCPCD_FORKED)
 		return;
 
+#ifdef IPV4LL
 	/* Stop IPv4LL now we have a working DHCP address */
 	ipv4ll_drop(ifp);
+#endif
 
 	if (ifo->options & DHCPCD_INFORM)
 		dhcp_inform(ifp);

Reply via email to