Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/dist/src Allow dhcpcd to be built withou...



details:   https://anonhg.NetBSD.org/src/rev/b54989f913f4
branches:  trunk
changeset: 462168:b54989f913f4
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Jul 26 10:47:29 2019 +0000

description:
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.

diffstat:

 external/bsd/dhcpcd/dist/src/dhcp.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r e21e2ecf0830 -r b54989f913f4 external/bsd/dhcpcd/dist/src/dhcp.c
--- a/external/bsd/dhcpcd/dist/src/dhcp.c       Fri Jul 26 10:42:41 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp.c       Fri Jul 26 10:47:29 2019 +0000
@@ -2329,7 +2329,9 @@
        return astate;
 }
 #endif
-
+#endif /* ARP */
+
+#if defined(ARP) || defined(KERNEL_RFC5227)
 static int
 dhcp_arp_address(struct interface *ifp)
 {
@@ -2417,7 +2419,7 @@
            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 @@
        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);



Home | Main Index | Thread Index | Old Index