]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: fix return values
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 26 Nov 2020 23:18:32 +0000 (08:18 +0900)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 8 Dec 2020 17:08:31 +0000 (18:08 +0100)
(cherry picked from commit 72f092815ada28431103d2145ffa61e1ae14aded)

src/network/netdev/netdev.c

index 446a580e2cc91af4502d9b23da6e4625146d2d15..1af127b4f1fd8c606adf25daf15b7383232e9172 100644 (file)
@@ -432,7 +432,7 @@ int netdev_set_ifindex(NetDev *netdev, sd_netlink_message *message) {
         if (!streq(netdev->ifname, received_name)) {
                 log_netdev_error(netdev, "Received newlink with wrong IFNAME %s", received_name);
                 netdev_enter_failed(netdev);
-                return r;
+                return -EINVAL;
         }
 
         r = sd_netlink_message_enter_container(message, IFLA_LINKINFO);
@@ -460,11 +460,10 @@ int netdev_set_ifindex(NetDev *netdev, sd_netlink_message *message) {
         }
 
         if (!streq(kind, received_kind)) {
-                log_netdev_error(netdev,
-                                 "Received newlink with wrong KIND %s, "
-                                 "expected %s", received_kind, kind);
+                log_netdev_error(netdev, "Received newlink with wrong KIND %s, expected %s",
+                                 received_kind, kind);
                 netdev_enter_failed(netdev);
-                return r;
+                return -EINVAL;
         }
 
         netdev->ifindex = ifindex;