From: tomty89 <tom.ty89@gmail.com>
Date: Fri, 20 May 2016 10:28:30 +0000 (+0800)
Subject: [networkd-dhcp6] do not call sd_dhcp6_client_start() from dhcp6_request_address()
X-Git-Tag: v230~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3304%2Fhead;p=thirdparty%2Fsystemd.git

[networkd-dhcp6] do not call sd_dhcp6_client_start() from dhcp6_request_address()

Starting the DHCP client doesn't seem like dhcp6_request_address()'s responsibility anyway. Whenever it's called, sd_dhcp6_client_start() is unconditionally called outside of it as well. See ndisc_router_handler() and ndisc_handler() in networkd-ndisc.c.
---

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 6085b28f868..37e13e639e3 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -194,12 +194,6 @@ int dhcp6_request_address(Link *link) {
         if (r < 0)
                 return r;
 
-        if (running) {
-                r = sd_dhcp6_client_start(link->dhcp6_client);
-                if (r < 0)
-                        return r;
-        }
-
         return 0;
 }