summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-12-13 16:52:54 +0100
committerThomas Haller <thaller@redhat.com>2020-12-13 16:56:51 +0100
commit7f4a7bf4333562e2ff70b67b1dd0e9d4c4bfb28f (patch)
tree10783621cd9627ed2c91db8ddd28def0a35ed667
parent0a730fe0eacbbc442ec13fb4e1924f40a9093844 (diff)
downloadNetworkManager-7f4a7bf4333562e2ff70b67b1dd0e9d4c4bfb28f.tar.gz
all: remove unnecessary <netinet/ether.h> includes
<netinet/ether.h> with musl defines ethhdr struct, which conflicts with <linux/if_ether.h>. The latter is included by "nm-utils.h", so this is a problem. Drop includes of "netinet/ether.h" that are not necessary.
-rw-r--r--clients/cli/connections.c1
-rw-r--r--shared/n-dhcp4/src/test-run-client.c1
-rw-r--r--src/initrd/tests/test-cmdline-reader.c1
-rw-r--r--src/initrd/tests/test-dt-reader.c1
-rw-r--r--src/initrd/tests/test-ibft-reader.c1
-rw-r--r--src/systemd/src/libsystemd-network/network-internal.c1
-rw-r--r--src/tests/test-core-with-expect.c1
7 files changed, 0 insertions, 7 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 5b8929b997..9b5b540326 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -11,7 +11,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
-#include <netinet/ether.h>
#include <readline/readline.h>
#include <readline/history.h>
#include <fcntl.h>
diff --git a/shared/n-dhcp4/src/test-run-client.c b/shared/n-dhcp4/src/test-run-client.c
index e558801470..d8795021d3 100644
--- a/shared/n-dhcp4/src/test-run-client.c
+++ b/shared/n-dhcp4/src/test-run-client.c
@@ -11,7 +11,6 @@
#include <errno.h>
#include <getopt.h>
#include <net/if.h>
-#include <netinet/ether.h>
#include <netinet/in.h>
#include <poll.h>
#include <stdbool.h>
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index 14a83c084a..8e62a2a467 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -8,7 +8,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <netinet/ether.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/src/initrd/tests/test-dt-reader.c b/src/initrd/tests/test-dt-reader.c
index 0d457782f6..55e2b1f116 100644
--- a/src/initrd/tests/test-dt-reader.c
+++ b/src/initrd/tests/test-dt-reader.c
@@ -8,7 +8,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <netinet/ether.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/src/initrd/tests/test-ibft-reader.c b/src/initrd/tests/test-ibft-reader.c
index 51942b181a..b0d465390d 100644
--- a/src/initrd/tests/test-ibft-reader.c
+++ b/src/initrd/tests/test-ibft-reader.c
@@ -8,7 +8,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <netinet/ether.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/src/systemd/src/libsystemd-network/network-internal.c b/src/systemd/src/libsystemd-network/network-internal.c
index 6a7382ac07..7a53565d40 100644
--- a/src/systemd/src/libsystemd-network/network-internal.c
+++ b/src/systemd/src/libsystemd-network/network-internal.c
@@ -4,7 +4,6 @@
#include <arpa/inet.h>
#include <linux/if.h>
-#include <netinet/ether.h>
#include "sd-id128.h"
#include "sd-ndisc.h"
diff --git a/src/tests/test-core-with-expect.c b/src/tests/test-core-with-expect.c
index 9c77a85d47..547c659480 100644
--- a/src/tests/test-core-with-expect.c
+++ b/src/tests/test-core-with-expect.c
@@ -6,7 +6,6 @@
#include "nm-default.h"
#include <time.h>
-#include <netinet/ether.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <fcntl.h>