]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd: fix logging of error codes
authorLennart Poettering <lennart@poettering.net>
Thu, 18 Feb 2016 21:49:48 +0000 (22:49 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 20 Feb 2016 21:42:29 +0000 (22:42 +0100)
src/network/networkd-link.c

index 5f91f4c9c236ade2489d4b19bf3933609ab31c82..e63af3afdbca0a630189f8984dd81f161e2ffc0e 100644 (file)
@@ -513,31 +513,31 @@ static int link_stop_clients(Link *link) {
         if (link->dhcp_client) {
                 k = sd_dhcp_client_stop(link->dhcp_client);
                 if (k < 0)
-                        r = log_link_warning_errno(link, r, "Could not stop DHCPv4 client: %m");
+                        r = log_link_warning_errno(link, k, "Could not stop DHCPv4 client: %m");
         }
 
         if (link->ipv4ll) {
                 k = sd_ipv4ll_stop(link->ipv4ll);
                 if (k < 0)
-                        r = log_link_warning_errno(link, r, "Could not stop IPv4 link-local: %m");
+                        r = log_link_warning_errno(link, k, "Could not stop IPv4 link-local: %m");
         }
 
         if (link->dhcp6_client) {
                 k = sd_dhcp6_client_stop(link->dhcp6_client);
                 if (k < 0)
-                        r = log_link_warning_errno(link, r, "Could not stop DHCPv6 client: %m");
+                        r = log_link_warning_errno(link, k, "Could not stop DHCPv6 client: %m");
         }
 
         if (link->ndisc_router_discovery) {
                 k = sd_ndisc_stop(link->ndisc_router_discovery);
                 if (k < 0)
-                        r = log_link_warning_errno(link, r, "Could not stop IPv6 Router Discovery: %m");
+                        r = log_link_warning_errno(link, k, "Could not stop IPv6 Router Discovery: %m");
         }
 
         if (link->lldp) {
                 k = sd_lldp_stop(link->lldp);
                 if (k < 0)
-                        r = log_link_warning_errno(link, r, "Could not stop LLDP: %m");
+                        r = log_link_warning_errno(link, k, "Could not stop LLDP: %m");
         }
 
         return r;