Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757851AbdDRVB0 (ORCPT ); Tue, 18 Apr 2017 17:01:26 -0400 Received: from hauke-m.de ([5.39.93.123]:50671 "EHLO mail.hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756856AbdDRVA7 (ORCPT ); Tue, 18 Apr 2017 17:00:59 -0400 From: Hauke Mehrtens To: davem@davemloft.net, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jarod@redhat.com, jogo@openwrt.org, david.heidelberger@ixit.cz, maillist-linux@barfooze.de, mikko.rapeli@iki.fi, dwmw2@infradead.org, Hauke Mehrtens Subject: [PATCH v2 3/3] uapi/if_ether.h: prevent redefinition of struct ethhdr Date: Tue, 18 Apr 2017 23:00:36 +0200 Message-Id: <20170418210036.26039-4-hauke@hauke-m.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170418210036.26039-1-hauke@hauke-m.de> References: <20170418210036.26039-1-hauke@hauke-m.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2233 Lines: 72 From: David Heidelberger Musl provides its own ethhdr struct definition. Add a guard to prevent its definition of the appropriate musl header has already been included. Acked-by: Mikko Rapeli Signed-off-by: John Spencer Tested-by: David Heidelberger Signed-off-by: Jonas Gorski Signed-off-by: Hauke Mehrtens --- include/uapi/linux/if_ether.h | 3 +++ include/uapi/linux/libc-compat.h | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index 5bc9bfd816b7..fb5ab8c1e753 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h @@ -22,6 +22,7 @@ #define _UAPI_LINUX_IF_ETHER_H #include +#include /* * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble @@ -142,11 +143,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 ce2fa8a4ced6..c92d32f213d1 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -87,6 +87,14 @@ #endif /* _NET_IF_H */ +/* musl defines the ethhdr struct itself in its netinet/if_ether.h. + * Glibc just includes the kernel header and uses a different guard. */ +#if defined(_NETINET_IF_ETHER_H) +#define __UAPI_DEF_ETHHDR 0 +#else +#define __UAPI_DEF_ETHHDR 1 +#endif + /* Coordinate with glibc netinet/in.h header. */ #if defined(_NETINET_IN_H) @@ -182,6 +190,9 @@ /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 +/* Definitions for if_ether.h */ +#define __UAPI_DEF_ETHHDR 1 + /* Definitions for in.h */ #define __UAPI_DEF_IN_ADDR 1 #define __UAPI_DEF_IN_IPPROTO 1 -- 2.11.0