From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 25 Nov 2021 11:59:48 +0000 (+0900)
Subject: network: veth: use SYNTHETIC_ERRNO() macro or use real error cause
X-Git-Tag: v250-rc1~131^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a67e0507c313531957b2f061e5a0ce17576defc7;p=thirdparty%2Fsystemd.git

network: veth: use SYNTHETIC_ERRNO() macro or use real error cause
---

diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c
index cdbbf393614..8236a433158 100644
--- a/src/network/netdev/veth.c
+++ b/src/network/netdev/veth.c
@@ -58,20 +58,17 @@ static int netdev_veth_verify(NetDev *netdev, const char *filename) {
 
         assert(v);
 
-        if (!v->ifname_peer) {
-                log_netdev_warning(netdev, "Veth NetDev without peer name configured in %s. Ignoring",
-                                   filename);
-                return -EINVAL;
-        }
+        if (!v->ifname_peer)
+                return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL),
+                                                "Veth NetDev without peer name configured in %s. Ignoring",
+                                                filename);
 
         if (!v->mac_peer) {
                 r = netdev_get_mac(v->ifname_peer, &v->mac_peer);
-                if (r < 0) {
-                        log_netdev_warning(netdev,
-                                           "Failed to generate predictable MAC address for %s. Ignoring",
-                                           v->ifname_peer);
-                        return -EINVAL;
-                }
+                if (r < 0)
+                        return log_netdev_warning_errno(netdev, r,
+                                                        "Failed to generate predictable MAC address for %s: %m",
+                                                        v->ifname_peer);
         }
 
         return 0;