From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Feb 2016 21:49:48 +0000 (+0100)
Subject: networkd: fix logging of error codes
X-Git-Tag: v230~328^2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36c7d7097b2967f6d8b799f94f5eab92f66c5462;p=thirdparty%2Fsystemd.git

networkd: fix logging of error codes
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 5f91f4c9c23..e63af3afdbc 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -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;