netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Carlos O'Donell" <carlos@redhat.com>
To: David Miller <davem@davemloft.net>, xiyou.wangcong@gmail.com
Cc: netdev@vger.kernel.org, vlee@twopensource.com
Subject: Re: [Patch net-next] ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo
Date: Fri, 09 Jan 2015 11:27:46 -0500	[thread overview]
Message-ID: <54B00182.8060609@redhat.com> (raw)
In-Reply-To: <20150108.193819.258816805892789860.davem@davemloft.net>

On 01/08/2015 10:38 PM, David Miller wrote:
> From: Cong Wang <xiyou.wangcong@gmail.com>
> 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 <xiyou.wangcong@gmail.com>
> 
> Applied.
> 

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

Cheers,
Carlos.

  reply	other threads:[~2015-01-09 16:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-06 23:45 [Patch net-next] ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo Cong Wang
2015-01-06 23:45 ` [Patch net-next] doc: fix the compile error of txtimestamp.c Cong Wang
2015-01-09  3:38   ` David Miller
2015-01-09  3:38 ` [Patch net-next] ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo David Miller
2015-01-09 16:27   ` Carlos O'Donell [this message]
2015-02-06  5:29   ` Carlos O'Donell
2015-02-07  6:39     ` Cong Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54B00182.8060609@redhat.com \
    --to=carlos@redhat.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=vlee@twopensource.com \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).