From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 4 Dec 2018 09:44:55 +0000 (+0100)
Subject: missing: move several network related entries to missing_network.h
X-Git-Tag: v240~126^2~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec3f6df9cfb4dd2ae03a5abba61edbdaca6fbcaa;p=thirdparty%2Fsystemd.git

missing: move several network related entries to missing_network.h
---

diff --git a/src/basic/missing.h b/src/basic/missing.h
index e3ee46bccea..0f4605cb21f 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -116,10 +116,6 @@ struct sockaddr_vm {
 #define SOL_NETLINK 270
 #endif
 
-#ifndef NETLINK_LIST_MEMBERSHIPS
-#define NETLINK_LIST_MEMBERSHIPS 9
-#endif
-
 #ifndef SOL_SCTP
 #define SOL_SCTP 132
 #endif
@@ -252,15 +248,6 @@ struct sockaddr_vm {
 #define BPF_XOR 0xa0
 #endif
 
-/* Note that LOOPBACK_IFINDEX is currently not exported by the
- * kernel/glibc, but hardcoded internally by the kernel.  However, as
- * it is exported to userspace indirectly via rtnetlink and the
- * ioctls, and made use of widely we define it here too, in a way that
- * is compatible with the kernel's internal definition. */
-#ifndef LOOPBACK_IFINDEX
-#define LOOPBACK_IFINDEX 1
-#endif
-
 #ifndef MAX_AUDIT_MESSAGE_LENGTH
 #define MAX_AUDIT_MESSAGE_LENGTH 8970
 #endif
diff --git a/src/basic/missing_network.h b/src/basic/missing_network.h
index cba236b64db..2dfbe26882e 100644
--- a/src/basic/missing_network.h
+++ b/src/basic/missing_network.h
@@ -116,6 +116,11 @@
 #define NET_NAME_RENAMED 4
 #endif
 
+/* netlink.h */
+#ifndef NETLINK_LIST_MEMBERSHIPS /* b42be38b2778eda2237fc759e55e3b698b05b315 (4.2) */
+#define NETLINK_LIST_MEMBERSHIPS 9
+#endif
+
 /* rtnetlink.h */
 #ifndef RTA_PREF
 #define RTA_PREF 20
@@ -128,3 +133,12 @@
 #ifndef RTA_EXPIRES
 #define RTA_EXPIRES 23
 #endif
+
+/* Note that LOOPBACK_IFINDEX is currently not exported by the
+ * kernel/glibc, but hardcoded internally by the kernel.  However, as
+ * it is exported to userspace indirectly via rtnetlink and the
+ * ioctls, and made use of widely we define it here too, in a way that
+ * is compatible with the kernel's internal definition. */
+#ifndef LOOPBACK_IFINDEX
+#define LOOPBACK_IFINDEX 1
+#endif