tree-wide: drop netinet/ether.h from socket-util.h and sd-netlink.h

diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
index 36ec422f2c09103d458e7fc6d1f09fe5425b66f6..48a22415df944f6711e2244aedde8780e11d1afc 100644 (file)
--- a/src/basic/socket-util.h
+++ b/src/basic/socket-util.h
@@ -3,9 +3,9 @@
 
 #include <inttypes.h>
 #include <linux/netlink.h>
+#include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 #include <linux/if_packet.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <stdbool.h>
 #include <stddef.h>

diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c
index 3a86f3f077d046c2a1435267a1bd775fccebb00b..ac601a4efaf59ff4718f1944630b6f6f37972e7e 100644 (file)
--- a/src/libsystemd-network/arp-util.c
+++ b/src/libsystemd-network/arp-util.c
@@ -3,8 +3,9 @@
   Copyright © 2014 Axis Communications AB. All rights reserved.
 ***/
 
-#include <linux/filter.h>
 #include <arpa/inet.h>
+#include <linux/filter.h>
+#include <netinet/if_ether.h>
 
 #include "arp-util.h"
 #include "fd-util.h"

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 68b41dfb6cd777a9b6278358103d230a3f95eb88..d7a5349c70126559e3286fa4b6934841b0aea9a5 100644 (file)
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <linux/if_arp.h>
 #include <linux/if_infiniband.h>
 
 #include "sd-dhcp6-client.h"

diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index d960027a0f9bc4c13a5d3cf2c692aaa674455161..5a24f38ae9e340c3560dcf120fb3f5176e236fb0 100644 (file)
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -5,6 +5,7 @@
 
 #include <arpa/inet.h>
 #include <errno.h>
+#include <netinet/if_ether.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index 00056aa9e28902fd4207d457e3d877e44c38ff26..0983d7b51b807d160518ac89b04e4e4eb59434d2 100644 (file)
--- a/src/libsystemd-network/test-dhcp6-client.c
+++ b/src/libsystemd-network/test-dhcp6-client.c
@@ -4,6 +4,7 @@
 ***/
 
 #include <net/ethernet.h>
+#include <net/if_arp.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <sys/socket.h>

diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c
index 2e1488cb0ab6d2378321ddc1b25f7ad25f9c38a9..156718f20936677065e7610db26c6fefc28c42fb 100644 (file)
--- a/src/libsystemd-network/test-ipv4ll.c
+++ b/src/libsystemd-network/test-ipv4ll.c
@@ -4,6 +4,7 @@
 ***/
 
 #include <errno.h>
+#include <netinet/if_ether.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index f20254fc827d58b90b780116c0fab4468529efea..164e46675ccb378825d913fe6f180c8334213cf7 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -2,6 +2,7 @@
 
 #include <netinet/in.h>
 #include <linux/if.h>
+#include <linux/if_arp.h>
 
 #include "alloc-util.h"
 #include "hostname-util.h"

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index d6262a3885f664bdbeae4595e06747629c1d2f4b..b20aa78508400bcd4db6a0d7422afd8b742283ee 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -5,6 +5,7 @@
 
 #include <netinet/in.h>
 #include <linux/if.h>
+#include <linux/if_arp.h>
 #include "sd-radv.h"
 
 #include "sd-dhcp6-client.h"

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 17829fca9f9e7383d9814a2660b83a6f50612181..61f2bcaaba2aa7bf4935ecd05bc4e179ae9ac991 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2,6 +2,7 @@
 
 #include <netinet/in.h>
 #include <linux/if.h>
+#include <linux/if_arp.h>
 #include <unistd.h>
 
 #include "alloc-util.h"

diff --git a/src/network/networkd-lldp-rx.c b/src/network/networkd-lldp-rx.c
index 95018d37a3e9fb7b5af6edb47a7206a1543e3eaa..0631cc96a0bfa0a71ec0c97b58c477f922725ac5 100644 (file)
--- a/src/network/networkd-lldp-rx.c
+++ b/src/network/networkd-lldp-rx.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <unistd.h>
 
 #include "fd-util.h"

diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index 00c4358a0a89500900de89406815f7fa9913b766..6a9e459494af315e2af655ff49ce2a7426c5442d 100644 (file)
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -3,6 +3,7 @@
 #include <endian.h>
 #include <inttypes.h>
 #include <net/if.h>
+#include <net/if_arp.h>
 #include <string.h>
 
 #include "alloc-util.h"

diff --git a/src/systemd/sd-netlink.h b/src/systemd/sd-netlink.h
index b0a51185e9c19fc8dfe9f8a7119fc2044e96b40f..33cd82ba5a68b268a0cc065469b0afd9a0e8724b 100644 (file)
--- a/src/systemd/sd-netlink.h
+++ b/src/systemd/sd-netlink.h
@@ -19,7 +19,6 @@
 
 #include <inttypes.h>
 #include <net/ethernet.h>
-#include <netinet/ether.h>
 #include <netinet/in.h>
 #include <linux/neighbour.h>
 #include <linux/rtnetlink.h>