Mon Jun 4 16:45:52 2018 UTC ()
Sync


(roy)
diff -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/src/dhcp.c
cvs diff -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/src/dhcp.c (expand / switch to unified diff)

--- src/external/bsd/dhcpcd/dist/src/dhcp.c 2018/06/02 09:44:27 1.10
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c 2018/06/04 16:45:52 1.11
@@ -2091,28 +2091,30 @@ dhcp_arp_probed(struct arp_state *astate @@ -2091,28 +2091,30 @@ dhcp_arp_probed(struct arp_state *astate
2091 state->new = state->offer; 2091 state->new = state->offer;
2092 state->new_len = state->offer_len; 2092 state->new_len = state->offer_len;
2093 get_lease(ifp, &state->lease, state->new, state->new_len); 2093 get_lease(ifp, &state->lease, state->new, state->new_len);
2094 ipv4_applyaddr(astate->iface); 2094 ipv4_applyaddr(astate->iface);
2095 state->new = bootp; 2095 state->new = bootp;
2096 state->new_len = len; 2096 state->new_len = len;
2097 } 2097 }
2098#endif 2098#endif
2099 2099
2100 /* If we forked, stop here. */ 2100 /* If we forked, stop here. */
2101 if (ifp->ctx->options & DHCPCD_FORKED) 2101 if (ifp->ctx->options & DHCPCD_FORKED)
2102 return; 2102 return;
2103 2103
 2104#ifdef IPV4LL
2104 /* Stop IPv4LL now we have a working DHCP address */ 2105 /* Stop IPv4LL now we have a working DHCP address */
2105 ipv4ll_drop(ifp); 2106 ipv4ll_drop(ifp);
 2107#endif
2106 2108
2107 if (ifo->options & DHCPCD_INFORM) 2109 if (ifo->options & DHCPCD_INFORM)
2108 dhcp_inform(ifp); 2110 dhcp_inform(ifp);
2109} 2111}
2110 2112
2111static void 2113static void
2112dhcp_arp_conflicted(struct arp_state *astate, const struct arp_msg *amsg) 2114dhcp_arp_conflicted(struct arp_state *astate, const struct arp_msg *amsg)
2113{ 2115{
2114 struct interface *ifp; 2116 struct interface *ifp;
2115 struct dhcp_state *state; 2117 struct dhcp_state *state;
2116#ifdef ARPING 2118#ifdef ARPING
2117 struct if_options *ifo; 2119 struct if_options *ifo;
2118#endif 2120#endif