Commit 6926e041 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by David S. Miller
Browse files

uapi/if_ether.h: prevent redefinition of struct ethhdr



Musl provides its own ethhdr struct definition. Add a guard to prevent
its definition of the appropriate musl header has already been included.

glibc does not implement this header, but when glibc will implement this
they can just define __UAPI_DEF_ETHHDR 0 to make it work with the
kernel.
Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7bbfe00e
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define _UAPI_LINUX_IF_ETHER_H #define _UAPI_LINUX_IF_ETHER_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/libc-compat.h>
/* /*
* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
...@@ -149,11 +150,13 @@ ...@@ -149,11 +150,13 @@
* This is an Ethernet frame header. * This is an Ethernet frame header.
*/ */
#if __UAPI_DEF_ETHHDR
struct ethhdr { struct ethhdr {
unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
unsigned char h_source[ETH_ALEN]; /* source ether addr */ unsigned char h_source[ETH_ALEN]; /* source ether addr */
__be16 h_proto; /* packet type ID field */ __be16 h_proto; /* packet type ID field */
} __attribute__((packed)); } __attribute__((packed));
#endif
#endif /* _UAPI_LINUX_IF_ETHER_H */ #endif /* _UAPI_LINUX_IF_ETHER_H */
...@@ -264,4 +264,10 @@ ...@@ -264,4 +264,10 @@
#endif /* __GLIBC__ */ #endif /* __GLIBC__ */
/* Definitions for if_ether.h */
/* allow libcs like musl to deactivate this, glibc does not implement this. */
#ifndef __UAPI_DEF_ETHHDR
#define __UAPI_DEF_ETHHDR 1
#endif
#endif /* _UAPI_LIBC_COMPAT_H */ #endif /* _UAPI_LIBC_COMPAT_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment