From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 10 Oct 2018 05:39:35 +0000 (+0900)
Subject: network: make netlink callbacks return 1
X-Git-Tag: v240~571^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10201%2Fhead;p=thirdparty%2Fsystemd.git

network: make netlink callbacks return 1

This is not necessary. But most of netlink callbacks in networkd
return 1.
---

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 8e21b58875c..40b8780e569 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -110,7 +110,7 @@ static int dhcp6_route_remove_handler(sd_netlink *nl, sd_netlink_message *m, voi
         if (r < 0)
                 log_link_debug_errno(link, r, "Received error on unreachable route removal for DHCPv6 delegated subnetl: %m");
 
-        return 0;
+        return 1;
 }
 
 int dhcp6_lease_pd_prefix_lost(sd_dhcp6_client *client, Link* link) {
@@ -257,7 +257,7 @@ static int dhcp6_route_handler(sd_netlink *nl, sd_netlink_message *m, void *user
         if (r < 0 && r !=  -EEXIST)
                 log_link_debug_errno(link, r, "Received error when adding unreachable route for DHCPv6 delegated subnet: %m");
 
-        return 0;
+        return 1;
 }
 
 
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 596f3dee3fe..1f3204b4868 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1271,10 +1271,9 @@ static int link_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userd
         if (r < 0 && r != -EEXIST) {
                 log_link_error_errno(link, r, "Could not join netdev: %m");
                 link_enter_failed(link);
-                return 1;
         }
 
-        return 0;
+        return 1;
 }
 
 static int link_configure_after_setting_mtu(Link *link);
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 8d0f4638bc1..e5c929f29bc 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1286,7 +1286,7 @@ static int dhcp6_route_remove_handler(sd_netlink *nl, sd_netlink_message *m, voi
         if (r < 0)
                 log_link_debug_errno(link, r, "Received error on DHCPv6 Prefix Delegation route removal: %m");
 
-        return 0;
+        return 1;
 }
 
 static int manager_dhcp6_prefix_remove(Manager *m, struct in6_addr *addr) {