summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2022-07-27 17:04:47 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2022-07-27 19:04:12 +0200
commitd791bc9ce77a5c33f728d2dd6f25a9405d6b693d (patch)
tree38312cf79b7a35cd30f27e91c202321ea215646d
parent56f0fb752e9fd957c0445fdad74bf323e2df943d (diff)
platform: fix build with musl libcbg/tmp2
Fix the following build error with musl libc: In file included from /usr/include/net/ethernet.h:10, from ../src/libnm-platform/nm-linux-platform.c:17: /usr/include/netinet/if_ether.h:115:8: error: redefinition of 'struct ethhdr' 115 | struct ethhdr { | ^~~~~~ In file included from ../src/linux-headers/ethtool.h:19, from ../src/libnm-std-aux/nm-linux-compat.h:22, from ../src/libnm-platform/nm-linux-platform.c:10: /usr/include/linux/if_ether.h:169:8: note: originally defined here 169 | struct ethhdr { | ^~~~~~ Fixes: dc98ab807ca8 ('platform: include "linux-headers" via "libnm-std-aux/nm-linux-compat.h"')
-rw-r--r--src/libnm-platform/nm-linux-platform.c1
-rw-r--r--src/libnm-platform/wifi/nm-wifi-utils-nl80211.c1
-rw-r--r--src/libnm-platform/wifi/nm-wifi-utils.h2
-rw-r--r--src/libnm-platform/wpan/nm-wpan-utils.h2
4 files changed, 0 insertions, 6 deletions
diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c
index e445d0757b..ee5cb10434 100644
--- a/src/libnm-platform/nm-linux-platform.c
+++ b/src/libnm-platform/nm-linux-platform.c
@@ -14,7 +14,6 @@
#include <endian.h>
#include <fcntl.h>
#include <libudev.h>
-#include <net/ethernet.h>
#include <linux/fib_rules.h>
#include <linux/ip.h>
#include <linux/if.h>
diff --git a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c
index eab50f1615..08eded3103 100644
--- a/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/libnm-platform/wifi/nm-wifi-utils-nl80211.c
@@ -12,7 +12,6 @@
#include "libnm-std-aux/nm-linux-compat.h"
#include <sys/ioctl.h>
-#include <net/ethernet.h>
#include <unistd.h>
#include <linux/nl80211.h>
#include <linux/if.h>
diff --git a/src/libnm-platform/wifi/nm-wifi-utils.h b/src/libnm-platform/wifi/nm-wifi-utils.h
index 4dbeb21ff3..fd6364189c 100644
--- a/src/libnm-platform/wifi/nm-wifi-utils.h
+++ b/src/libnm-platform/wifi/nm-wifi-utils.h
@@ -7,8 +7,6 @@
#ifndef __WIFI_UTILS_H__
#define __WIFI_UTILS_H__
-#include <net/ethernet.h>
-
#include "libnm-platform/nm-netlink.h"
#include "libnm-base/nm-base.h"
diff --git a/src/libnm-platform/wpan/nm-wpan-utils.h b/src/libnm-platform/wpan/nm-wpan-utils.h
index 885d7195a8..eea5587dda 100644
--- a/src/libnm-platform/wpan/nm-wpan-utils.h
+++ b/src/libnm-platform/wpan/nm-wpan-utils.h
@@ -6,8 +6,6 @@
#ifndef __WPAN_UTILS_H__
#define __WPAN_UTILS_H__
-#include <net/ethernet.h>
-
#include "libnm-platform/nm-netlink.h"
typedef struct NMWpanUtils NMWpanUtils;