From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 23 Oct 2020 08:32:19 +0000 (+0900)
Subject: network: ignore error in writing proxy_ndp
X-Git-Tag: v247-rc1~6^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1dc5946e2b1ff52c2aeefb7aadac2b9a0904e52;p=thirdparty%2Fsystemd.git

network: ignore error in writing proxy_ndp

This partially reverts the commit fd773a11d8e2b01e9e6d234ca5693417c0101fca.

As, IPv6 may be disabled by kernel.
---

diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c
index fb8464ff2fa..ce193c0e506 100644
--- a/src/network/networkd-ipv6-proxy-ndp.c
+++ b/src/network/networkd-ipv6-proxy-ndp.c
@@ -84,7 +84,7 @@ static int ipv6_proxy_ndp_set(Link *link) {
 
         r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "proxy_ndp", v);
         if (r < 0)
-                return log_link_warning_errno(link, r, "Cannot configure proxy NDP for the interface: %m");
+                return log_link_warning_errno(link, r, "Cannot configure proxy NDP for the interface, ignoring: %m");
 
         return v;
 }
@@ -100,7 +100,7 @@ int link_set_ipv6_proxy_ndp_addresses(Link *link) {
         /* enable or disable proxy_ndp itself depending on whether ipv6_proxy_ndp_addresses are set or not */
         r = ipv6_proxy_ndp_set(link);
         if (r <= 0)
-                return r;
+                return 0;
 
         SET_FOREACH(address, link->network->ipv6_proxy_ndp_addresses) {
                 r = ipv6_proxy_ndp_address_configure(link, address);