From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 6 Nov 2023 06:28:12 +0000 (+0900)
Subject: Revert "ndisc: Also set link hoplimit"
X-Git-Tag: v255-rc1~2^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93e583aaba6f50fbd24aca71189a80fd77277edf;p=thirdparty%2Fsystemd.git

Revert "ndisc: Also set link hoplimit"

This reverts commit 0ba8374bb8a7032ca13ba98d10e8d7c3378ca9c6.

- link->network->ipv6_hop_limit must not be updated, as it may be used
  by multiple interfaces,
- We may receive multiple RA from multiple routers with different hop
  limit, and we should not make the default hop limit flicking,
- First of all, there is no reason that we need to update the default hop
  limit,
- The original issue should be caused by the hash and compare functions
  for Route object.
---

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index f4f662cf965..08af9c73b99 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -199,12 +199,7 @@ static int ndisc_request_route(Route *in, Link *link, sd_ndisc_router *rt) {
                 r = sd_ndisc_router_get_hop_limit(rt, &hop_limit);
                 if (r < 0 && r != -ENODATA)
                         return log_link_warning_errno(link, r, "Failed to get default router hop limit from RA: %m");
-
-                link->network->ipv6_hop_limit = hop_limit;
-                r = link_set_ipv6_hop_limit(link);
-                if (r < 0)
-                        log_link_warning_errno(link, r, "Cannot set IPv6 hop limit for interface, ignoring: %m");
-       }
+        }
 
         route->source = NETWORK_CONFIG_SOURCE_NDISC;
         route->provider.in6 = router;
diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c
index 1a5dffe6f59..0b8169a0176 100644
--- a/src/network/networkd-sysctl.c
+++ b/src/network/networkd-sysctl.c
@@ -165,7 +165,7 @@ static int link_set_ipv6_dad_transmits(Link *link) {
         return sysctl_write_ip_property_int(AF_INET6, link->ifname, "dad_transmits", link->network->ipv6_dad_transmits);
 }
 
-int link_set_ipv6_hop_limit(Link *link) {
+static int link_set_ipv6_hop_limit(Link *link) {
         assert(link);
 
         /* Make this a NOP if IPv6 is not available */
diff --git a/src/network/networkd-sysctl.h b/src/network/networkd-sysctl.h
index 99243f7a25d..064438462c0 100644
--- a/src/network/networkd-sysctl.h
+++ b/src/network/networkd-sysctl.h
@@ -28,7 +28,6 @@ typedef enum IPReversePathFilter {
 
 int link_set_sysctl(Link *link);
 int link_set_ipv6_mtu(Link *link);
-int link_set_ipv6_hop_limit(Link *link);
 
 const char* ipv6_privacy_extensions_to_string(IPv6PrivacyExtensions i) _const_;
 IPv6PrivacyExtensions ipv6_privacy_extensions_from_string(const char *s) _pure_;