]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd-ndisc: do not return value from void function v230
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 21 May 2016 22:12:17 +0000 (18:12 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 21 May 2016 22:31:29 +0000 (18:31 -0400)
Fixup for #3304.

Only warn, and not return, because that's what sd_dhcp6_client_start()
does right below the call to sd_dhcp6_client_set_local_address().

src/network/networkd-ndisc.c

index 78f02cf746b51894e0d382e13a0bf912b78e9c7e..1a380bd214e5d8079b1ef7fad27e02d05c392fb9 100644 (file)
@@ -159,7 +159,7 @@ static void ndisc_router_handler(sd_ndisc *nd, uint8_t flags, const struct in6_a
 
                 r = sd_dhcp6_client_set_local_address(link->dhcp6_client, &link->ipv6ll_address);
                 if (r < 0 && r != -EBUSY)
-                        return log_link_warning_errno(link, r, "Could not set IPv6LL address in DHCP client: %m");
+                        log_link_warning_errno(link, r, "Could not set IPv6LL address in DHCP client: %m");
 
                 r = sd_dhcp6_client_start(link->dhcp6_client);
                 if (r < 0 && r != -EBUSY)
@@ -209,7 +209,7 @@ static void ndisc_handler(sd_ndisc *nd, int event, void *userdata) {
 
                 r = sd_dhcp6_client_set_local_address(link->dhcp6_client, &link->ipv6ll_address);
                 if (r < 0 && r != -EBUSY)
-                        return log_link_warning_errno(link, r, "Could not set IPv6LL address in DHCP client: %m");
+                        log_link_warning_errno(link, r, "Could not set IPv6LL address in DHCP client: %m");
 
                 r = sd_dhcp6_client_start(link->dhcp6_client);
                 if (r < 0 && r != -EBUSY)