Subject: Re: [Patch net-next] ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo

From: "Carlos O'Donell" <[email-masked]>
Date: Fri, 09 Jan 2015 11:27:46 -0500

On 01/08/2015 10:38 PM, David Miller wrote:
> From: Cong Wang <[email-masked]>
> Date: Tue,  6 Jan 2015 15:45:31 -0800
> 
>> Both netinet/in.h and linux/ipv6.h define these two structs,
>> if we include both of them, we got:
>>
>> 	/usr/include/linux/ipv6.h:19:8: error: redefinition of ‘struct in6_pktinfo’
>> 	 struct in6_pktinfo {
>> 		^
>> 	In file included from /usr/include/arpa/inet.h:22:0,
>> 			 from txtimestamp.c:33:
>> 	/usr/include/netinet/in.h:524:8: note: originally defined here
>> 	 struct in6_pktinfo
>> 		^
>> 	In file included from txtimestamp.c:40:0:
>> 	/usr/include/linux/ipv6.h:24:8: error: redefinition of ‘struct ip6_mtuinfo’
>> 	 struct ip6_mtuinfo {
>> 		^
>> 	In file included from /usr/include/arpa/inet.h:22:0,
>> 			 from txtimestamp.c:33:
>> 	/usr/include/netinet/in.h:531:8: note: originally defined here
>> 	 struct ip6_mtuinfo
>> 		^
>> So similarly to what we did for in6_addr, we need to sync with
>> libc header on their definitions.
>>
>> Signed-off-by: Cong Wang <[email-masked]>
> 
> Applied.
> 

I'm reviewing the glibc side and will apply there if nobody has done so yet.

Cheers,
Carlos.