diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2022-07-27 17:04:47 +0200 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2022-07-27 18:46:01 +0200 |
commit | dbf29c54508e7fb198b815e6fa6249b66005fcf3 (patch) | |
tree | 0bb733c94458224ee10ac8ea4aa3831c5059ab6c | |
parent | 56f0fb752e9fd957c0445fdad74bf323e2df943d (diff) | |
download | NetworkManager-dbf29c54508e7fb198b815e6fa6249b66005fcf3.tar.gz |
platform: fix build with musl libc
Don't mix <net/ethernet.h> and <linux/if_ether.h>.
Fixes 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/core/devices/bluetooth/nm-bluez5-dun.c | 1 | ||||
-rw-r--r-- | src/core/devices/nm-lldp-listener.c | 2 | ||||
-rw-r--r-- | src/libnm-platform/nm-linux-platform.c | 1 | ||||
-rw-r--r-- | src/libnm-platform/wifi/nm-wifi-utils-nl80211.c | 1 | ||||
-rw-r--r-- | src/libnm-platform/wifi/nm-wifi-utils.h | 2 | ||||
-rw-r--r-- | src/libnm-platform/wpan/nm-wpan-utils.h | 2 |
6 files changed, 0 insertions, 9 deletions
diff --git a/src/core/devices/bluetooth/nm-bluez5-dun.c b/src/core/devices/bluetooth/nm-bluez5-dun.c index 426bab0cdd..fdfeab2af5 100644 --- a/src/core/devices/bluetooth/nm-bluez5-dun.c +++ b/src/core/devices/bluetooth/nm-bluez5-dun.c @@ -9,7 +9,6 @@ #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> #include <bluetooth/rfcomm.h> -#include <net/ethernet.h> #include <sys/ioctl.h> #include <unistd.h> #include <fcntl.h> diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c index 137bf8fbfe..4cccb4a306 100644 --- a/src/core/devices/nm-lldp-listener.c +++ b/src/core/devices/nm-lldp-listener.c @@ -7,8 +7,6 @@ #include "nm-lldp-listener.h" -#include <net/ethernet.h> - #include "NetworkManagerUtils.h" #include "libnm-core-public/nm-errors.h" #include "libnm-glib-aux/nm-time-utils.h" 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; |