From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 14 Aug 2023 10:54:40 +0000 (+0200)
Subject: tree-wide: Always include <net/if.h> before related linux headers
X-Git-Tag: v255-rc1~726^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2af02e61657aa513aa7b6df7fd1a04b13f853cef;p=thirdparty%2Fsystemd.git

tree-wide: Always include <net/if.h> before related linux headers

Otherwise, we get redefinition errors if <net/if.h> is included later
on by another header.
---

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 6d62ba380b8..9a4f3ab1bf0 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -5,8 +5,9 @@
 
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <linux/if_arp.h>
-#include <linux/if_infiniband.h>
+#include <net/if.h>
+#include <linux/if_arp.h> /* Must be included after <net/if.h> */
+#include <linux/if_infiniband.h> /* Must be included after <net/if.h> */
 
 #include "sd-dhcp6-client.h"
 
diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index 8221fd92dbd..fedc2e4f04d 100644
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
-#include <linux/if_arp.h>
-#include <linux/if.h>
+#include <net/if.h>
+#include <linux/if_arp.h> /* Must be included after <net/if.h> */
+#include <linux/if.h> /* Must be included after <net/if.h> */
 
 #include "sd-dhcp-server.h"
 
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index ab5460db27e..51434a1abd2 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -3,7 +3,8 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include <linux/if.h>
+#include <net/if.h>
+#include <linux/if.h> /* Must be included after <net/if.h> */
 #include <linux/fib_rules.h>
 #include <linux/nexthop.h>
 #include <linux/nl80211.h>
diff --git a/src/network/networkd-state-file.c b/src/network/networkd-state-file.c
index 85c9d210820..e27984d2de8 100644
--- a/src/network/networkd-state-file.c
+++ b/src/network/networkd-state-file.c
@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <netinet/in.h>
-#include <linux/if.h>
+#include <net/if.h>
+#include <linux/if.h> /* Must be included after <net/if.h> */
 
 #include "alloc-util.h"
 #include "dns-domain.h"
diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index dd5daddce48..a60aabb3959 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <linux/if.h>
+#include <net/if.h>
+#include <linux/if.h> /* Must be included after <net/if.h> */
 #include <unistd.h>
 
 #include "sd-network.h"
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index ff8fb24f669..e7b28d33f07 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <linux/netdevice.h>
+#include <net/if.h>
+#include <linux/netdevice.h> /* Must be included after <net/if.h> */
 #include <netinet/ether.h>
 #include <unistd.h>