| Message ID | 20190214122720.27172-1-linus.walleij@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | uapi/if_ether.h: prevent redefinition of struct ethhdr | expand |
On Thu, Feb 14, 2019 at 01:27:20PM +0100, Linus Walleij wrote: > From: Hauke Mehrtens <hauke@hauke-m.de> > > commit 6926e041a8920c8ec27e4e155efa760aa01551fd upstream. > > 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: Hauke Mehrtens <hauke@hauke-m.de> > Signed-off-by: David S. Miller <davem@davemloft.net> > --- > - This is upstream in v4.15 > - This should be applied for stable v4.14.y and v4.9.y Sounds good, but do you also want to sign off on it? :) thanks, greg k-h
On Thu, Feb 14, 2019 at 1:45 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > On Thu, Feb 14, 2019 at 01:27:20PM +0100, Linus Walleij wrote: > > From: Hauke Mehrtens <hauke@hauke-m.de> > > > > commit 6926e041a8920c8ec27e4e155efa760aa01551fd upstream. > > > > 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: Hauke Mehrtens <hauke@hauke-m.de> > > Signed-off-by: David S. Miller <davem@davemloft.net> > > --- > > - This is upstream in v4.15 > > - This should be applied for stable v4.14.y and v4.9.y > > Sounds good, but do you also want to sign off on it? :) Oh deliver path, yeah, so many details :D OK I respin the whole lot with signed-off-by's. Yours, Linus Walleij
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index 244e3213ecb0..60ec9114e28f 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h @@ -23,6 +23,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 @@ -150,11 +151,13 @@ * 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 */ diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 8254c937c9f4..fc29efaa918c 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -264,4 +264,10 @@ #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 */