summaryrefslogtreecommitdiff
path: root/src/network/networkd-ndisc.c
diff options
context:
space:
mode:
authorTom Yan <tom.ty89@gmail.com>2016-06-02 01:05:50 +0800
committerTom Yan <tom.ty89@gmail.com>2016-06-02 01:05:50 +0800
commitacac5b2f512e03830df06df3fc30aff28d01d6b3 (patch)
treefd9d466be835cdf94cfa7c3b1d6131d0019fcb1e /src/network/networkd-ndisc.c
parent720bec40e94a65d7a63a0091773b2bab2934ee41 (diff)
networkd-ndisc: do not start DHCPv6 when after NDISC timeout
For it's silly and unnecessary. Although it was apparently mandated by RFC 2462 in [5.5.2. Absence of Router Advertisements], that has been changed in the same section of RFC 4862, which obsoleted the former RFC.
Diffstat (limited to 'src/network/networkd-ndisc.c')
-rw-r--r--src/network/networkd-ndisc.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index db9be024e5..7359cc2b67 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -197,21 +197,12 @@ static void ndisc_handler(sd_ndisc *nd, int event, void *userdata) {
int r;
assert(link);
- assert(link->dhcp6_client);
- assert(in_addr_is_link_local(AF_INET6, (const union in_addr_union*)&link->ipv6ll_address) > 0);
if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
return;
switch (event) {
case SD_NDISC_EVENT_TIMEOUT:
- /* (re)start DHCPv6 client in stateful mode */
- r = dhcp6_request_address(link, false);
- if (r < 0 && r != -EBUSY)
- log_link_warning_errno(link, r, "Could not acquire DHCPv6 lease after NDisc timeout: %m");
- else
- log_link_debug(link, "Acquiring DHCPv6 lease after NDisc timeout");
-
link->ndisc_configured = true;
link_check_ready(link);