Module Name: src
Committed By: roy
Date: Fri Jul 26 10:47:29 UTC 2019
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcp.c
Log Message:
Allow dhcpcd to be built without ARP support for SMALL builds.
This is fine because the kernel supports RFC 5227 which dhcpcd uses
instead to detect and act on address duplication.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.22
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.21 Thu Jul 25 08:55:18 2019
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Fri Jul 26 10:47:29 2019
@@ -2329,7 +2329,9 @@ dhcp_arp_new(struct interface *ifp, stru
return astate;
}
#endif
+#endif /* ARP */
+#if defined(ARP) || defined(KERNEL_RFC5227)
static int
dhcp_arp_address(struct interface *ifp)
{
@@ -2417,7 +2419,7 @@ dhcp_static(struct interface *ifp)
ia ? &ia->addr : &ifo->req_addr,
ia ? &ia->mask : &ifo->req_mask);
if (state->offer_len)
-#ifdef ARP
+#if defined(ARP) || defined(KERNEL_RFC5227)
dhcp_arp_bind(ifp);
#else
dhcp_bind(ifp);
@@ -3210,7 +3212,7 @@ rapidcommit:
lease->frominfo = 0;
eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
-#ifdef ARP
+#if defined(ARP) || defined(KERNEL_RFC5227)
dhcp_arp_bind(ifp);
#else
dhcp_bind(ifp);
