From mboxrd@z Thu Jan  1 00:00:00 1970
From: Guillaume Nault <g.nault@alphalink.fr>
Subject: Re: [PATCH] uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define
Date: Tue, 13 Feb 2018 17:52:26 +0100
Message-ID: <20180213165226.GE1422@alphalink.fr>
References: <20180212225951.24708-1-hauke@hauke-m.de>
 <1dafbb8b-19c2-373b-3f11-2224275dac23@hauke-m.de>
 <20180213.112407.318790592186486423.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <netdev-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20180213.112407.318790592186486423.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
To: David Miller <davem@davemloft.net>
Cc: hauke@hauke-m.de, linux-api@vger.kernel.org, netdev@vger.kernel.org, stable@vger.kernel.org
List-Id: linux-api@vger.kernel.org

On Tue, Feb 13, 2018 at 11:24:07AM -0500, David Miller wrote:
> From: Hauke Mehrtens <hauke@hauke-m.de>
> Date: Tue, 13 Feb 2018 00:01:26 +0100
> 
> > On 02/12/2018 11:59 PM, Hauke Mehrtens wrote:
> >> This fixes a compile problem of some user space applications by not
> >> including linux/libc-compat.h in uapi/if_ether.h.
> >> 
> >> linux/libc-compat.h checks which "features" the header files, included
> >> from the libc, provide to make the Linux kernel uapi header files only
> >> provide no conflicting structures and enums. If a user application mixes
> >> kernel headers and libc headers it could happen that linux/libc-compat.h
> >> gets included too early where not all other libc headers are included
> >> yet. Then the linux/libc-compat.h would not prevent all the
> >> redefinitions and we run into compile problems.
> >> This patch removes the include of linux/libc-compat.h from
> >> uapi/if_ether.h to fix the recently introduced case, but not all as this
> >> is more or less impossible.
> >> 
> >> It is no problem to do the check directly in the if_ether.h file and not
> >> in libc-compat.h as this does not need any fancy glibc header detection
> >> as glibc never provided struct ethhdr and should define
> >> __UAPI_DEF_ETHHDR by them self when they will provide this.
> >> 
> >> The following test program did not compile correctly any more:
> >> 
> >> int main(void)
> >> {
> >>         return 0;
> >> }
> > 
> > git removed the included here:
> > 
> > #include <linux/if_ether.h>
> > #include <netinet/in.h>
> > #include <linux/in.h>
> > 
> > int main(void)
> > {
> > 	return 0;
> > }
> 
> Applied with this fixed up, thanks!

Works fine. Thanks Hauke!