From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 23 Apr 2024 06:29:28 +0000 (+0900)
Subject: network/route: use our definitions of route preference
X-Git-Tag: v256-rc1~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30eab38020522eae93bc7b0530b1ccc2d8aceb16;p=thirdparty%2Fsystemd.git

network/route: use our definitions of route preference

Including linux/icmpv6.h easily trigger conflicts when another header
includes netinet/icmp6.h. Let's drop the dependency and use our
definition of the same values.
---

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index efe378a4572..a4c56f1bbd6 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <linux/icmpv6.h>
 #include <linux/ipv6_route.h>
 #include <linux/nexthop.h>
 
@@ -1810,11 +1809,11 @@ int config_parse_ipv6_route_preference(
         }
 
         if (streq(rvalue, "low"))
-                route->pref = ICMPV6_ROUTER_PREF_LOW;
+                route->pref = SD_NDISC_PREFERENCE_LOW;
         else if (streq(rvalue, "medium"))
-                route->pref = ICMPV6_ROUTER_PREF_MEDIUM;
+                route->pref = SD_NDISC_PREFERENCE_MEDIUM;
         else if (streq(rvalue, "high"))
-                route->pref = ICMPV6_ROUTER_PREF_HIGH;
+                route->pref = SD_NDISC_PREFERENCE_HIGH;
         else {
                 log_syntax(unit, LOG_WARNING, filename, line, 0, "Unknown route preference: %s", rvalue);
                 return 0;