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 6d62ba380b808638427ffbc0b92218692ebf1b49..9a4f3ab1bf004740967e28c4cb24397aafe64df0 100644 (file)
--- 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 8221fd92dbdb5ebc9996016712621655e18f2c49..fedc2e4f04d83842fdac4dfdfd6d1132dfc39ebd 100644 (file)
--- 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 ab5460db27ec9eb4cad25147f7af3640d735ef29..51434a1abd27eed0ac025bd74b2eb70bf7d1ab9d 100644 (file)
--- 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 85c9d2108204d391a95122a8cdc0b950d64b052e..e27984d2de8ace9fd1521bfd8dc4b0458d0d12be 100644 (file)
--- 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 dd5daddce486f166f2123a46d2ebcca06c89e413..a60aabb39590abd7492630a1af2a304a8addfa96 100644 (file)
--- 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 ff8fb24f6695385edff4497575ee0398aad20a93..e7b28d33f07b74c831ac80a73827533ef5135f18 100644 (file)
--- 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>