40 lines
1.0 KiB
Diff
40 lines
1.0 KiB
Diff
--- include/uapi/linux/if_ether.h.orig
|
|
+++ include/uapi/linux/if_ether.h
|
|
@@ -22,6 +22,7 @@
|
|
#define _UAPI_LINUX_IF_ETHER_H
|
|
|
|
#include <linux/types.h>
|
|
+#include <linux/libc-compat.h>
|
|
|
|
/*
|
|
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
|
|
@@ -130,11 +131,12 @@
|
|
* This is an Ethernet frame header.
|
|
*/
|
|
|
|
+#if __UAPI_DEF_ETHHDR
|
|
struct ethhdr {
|
|
unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
|
|
unsigned char h_source[ETH_ALEN]; /* source ether addr */
|
|
__be16 h_proto; /* packet type ID field */
|
|
} __attribute__((packed));
|
|
-
|
|
+#endif
|
|
|
|
#endif /* _UAPI_LINUX_IF_ETHER_H */
|
|
--- include/uapi/linux/libc-compat.h.orig
|
|
+++ include/uapi/linux/libc-compat.h
|
|
@@ -50,6 +50,12 @@
|
|
|
|
#ifndef __KERNEL__ /* we're used from userspace */
|
|
|
|
+#ifdef _NETINET_IF_ETHER_H /* musl */
|
|
+#define __UAPI_DEF_ETHHDR 0
|
|
+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
|
|
+#define __UAPI_DEF_ETHHDR 1
|
|
+#endif
|
|
+
|
|
/* Coordinate with libc netinet/in.h header. */
|
|
#ifdef _NETINET_IN_H
|
|
|