next-timestamp build failure with 3.19-rc2

next-timestamp build failure with 3.19-rc2

[Vinson Lee]

Hi.

I'm hitting the following build error with 3.19-rc2 on CentOS 5 with
glibc-headers-2.5-123.

  HOSTCC  Documentation/networking/timestamping/txtimestamp
Documentation/networking/timestamping/txtimestamp.c:64:8: error:
redefinition of ‘struct in6_pktinfo’
 struct in6_pktinfo {
        ^
In file included from /usr/include/arpa/inet.h:23:0,
                 from Documentation/networking/timestamping/txtimestamp.c:33:
/usr/include/netinet/in.h:456:8: note: originally defined here
 struct in6_pktinfo
        ^

The build error was introduced with
cbd3aad5ce66f5a266a185aa37e0eb9be9ba4154 "net-timestamp: expand
documentation and test".

commit cbd3aad5ce66f5a266a185aa37e0eb9be9ba4154
Author: Willem de Bruijn <willemb@google.com>
Date:   Sun Nov 30 22:22:35 2014 -0500

    net-timestamp: expand documentation and test

    Documentation:
      expand explanation of timestamp counter

    Test:
      new: flag -I requests and prints PKTINFO
      new: flag -x prints payload (possibly truncated)
      fix: remove pretty print that breaks common flag '-l 1'

    Signed-off-by: Willem de Bruijn <willemb@google.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>


Cheers,
Vinson

Re: next-timestamp build failure with 3.19-rc2

[Cong Wang]

On Mon, Jan 5, 2015 at 11:55 AM, Vinson Lee <vlee@twopensource.com> wrote:
> Hi.
>
> I'm hitting the following build error with 3.19-rc2 on CentOS 5 with
> glibc-headers-2.5-123.
>
>   HOSTCC  Documentation/networking/timestamping/txtimestamp
> Documentation/networking/timestamping/txtimestamp.c:64:8: error:
> redefinition of ‘struct in6_pktinfo’
>  struct in6_pktinfo {
>         ^
> In file included from /usr/include/arpa/inet.h:23:0,
>                  from Documentation/networking/timestamping/txtimestamp.c:33:
> /usr/include/netinet/in.h:456:8: note: originally defined here
>  struct in6_pktinfo
>         ^

We need the same workaround as we did for in6_addr etc..
I am working on a patch now.