]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
[networkd-dhcp6] do not call sd_dhcp6_client_start() from dhcp6_request_address() 3304/head
authortomty89 <tom.ty89@gmail.com>
Fri, 20 May 2016 10:28:30 +0000 (18:28 +0800)
committertomty89 <tom.ty89@gmail.com>
Fri, 20 May 2016 10:28:30 +0000 (18:28 +0800)
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.

src/network/networkd-dhcp6.c

index 6085b28f86887edc4a8de3bd3fa396fe59c3dbb4..37e13e639e33bb2243f377b88e44408763a7fc9e 100644 (file)
@@ -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;
 }