From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 7 Sep 2024 15:19:20 +0000 (+0900)
Subject: missing_network: drop unnecessary definition
X-Git-Tag: v257-rc1~514^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47a71f98529e73f262fd99b7ce77a69055b469b8;p=thirdparty%2Fsystemd.git

missing_network: drop unnecessary definition

Now we have ipv6.h, hence the definition is not necessary anymore.
---

diff --git a/src/basic/missing_network.h b/src/basic/missing_network.h
index ff5b30d3e1b..ded1bc2f5ec 100644
--- a/src/basic/missing_network.h
+++ b/src/basic/missing_network.h
@@ -23,11 +23,6 @@
 #define IPV4_MIN_MTU 68
 #endif
 
-/* linux/ipv6.h */
-#ifndef IPV6_MIN_MTU
-#define IPV6_MIN_MTU 1280
-#endif
-
 /* Note that LOOPBACK_IFINDEX is currently not exposed by the
  * kernel/glibc, but hardcoded internally by the kernel.  However, as
  * it is exported to userspace indirectly via rtnetlink and the
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 7700c4edef8..faa5344921c 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -2,6 +2,7 @@
 
 #include <errno.h>
 #include <inttypes.h>
+#include <linux/ipv6.h>
 #include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/libsystemd-network/ndisc-option.c b/src/libsystemd-network/ndisc-option.c
index 901a3b399bb..af38c32be12 100644
--- a/src/libsystemd-network/ndisc-option.c
+++ b/src/libsystemd-network/ndisc-option.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <linux/ipv6.h>
 #include <netinet/icmp6.h>
 
 #include "dns-domain.h"
diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
index 058bc00ba10..b1a2623dcd1 100644
--- a/src/network/networkd-setlink.c
+++ b/src/network/networkd-setlink.c
@@ -4,6 +4,7 @@
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_bridge.h>
+#include <linux/ipv6.h>
 
 #include "missing_network.h"
 #include "netif-util.h"
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 210a71c9d55..c842bf69c5e 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <linux/ipv6.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <sys/ioctl.h>
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 6db94317086..c2a42a1ae0e 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -2,6 +2,7 @@
 
 #include <errno.h>
 #include <limits.h>
+#include <linux/ipv6.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>