Sync with dhcpcd-10.0.8
This commit is contained in:
parent
ed7347c8ff
commit
76a8def0a9
|
@ -3494,7 +3494,7 @@ dhcp6_recvif(struct interface *ifp, const char *sfrom,
|
||||||
* To keep the same behaviour we won't do anything with
|
* To keep the same behaviour we won't do anything with
|
||||||
* this. In the future we should make a lists of
|
* this. In the future we should make a lists of
|
||||||
* ADVERTS and pick the "best" one. */
|
* ADVERTS and pick the "best" one. */
|
||||||
logdebugx("%s: discarding ADVERTISMENT from %s",
|
logdebugx("%s: discarding ADVERTISEMENT from %s",
|
||||||
ifp->name, sfrom);
|
ifp->name, sfrom);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -423,8 +423,8 @@ dhcpcd_drop_af(struct interface *ifp, int stop, int af)
|
||||||
#endif
|
#endif
|
||||||
#ifdef ARP
|
#ifdef ARP
|
||||||
arp_drop(ifp);
|
arp_drop(ifp);
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
#if !defined(DHCP6) && !defined(DHCP)
|
#if !defined(DHCP6) && !defined(DHCP)
|
||||||
UNUSED(stop);
|
UNUSED(stop);
|
||||||
|
|
Loading…
Reference in New Issue