]> git.baikalelectronics.ru Git - kernel.git/commit
ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo
authorWANG Cong <xiyou.wangcong@gmail.com>
Tue, 6 Jan 2015 23:45:31 +0000 (15:45 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Jan 2015 03:29:11 +0000 (19:29 -0800)
commit925235a6daf3659b17eeabf6735d71f6cf59c1f9
treedb50ca1e9dbe734841c07582030a75ba2d5ead05
parenta090202311985af0e5cf1e8bf80f5ecaa503b8de
ipv6: fix redefinition of in6_pktinfo and ip6_mtuinfo

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/ipv6.h
include/uapi/linux/libc-compat.h