summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/ipv6.h
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2015-01-06 15:45:31 -0800
committerDavid S. Miller <davem@davemloft.net>2015-01-08 19:29:11 -0800
commit3b50d9029809b60a5081d90c282aa04d438d3ea1 (patch)
treedb50ca1e9dbe734841c07582030a75ba2d5ead05 /include/uapi/linux/ipv6.h
parent44d84d7272e5848878a96029b8a8b6e86854f146 (diff)
downloadlinux-3b50d9029809b60a5081d90c282aa04d438d3ea1.tar.gz
linux-3b50d9029809b60a5081d90c282aa04d438d3ea1.tar.bz2
linux-3b50d9029809b60a5081d90c282aa04d438d3ea1.zip
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>
Diffstat (limited to 'include/uapi/linux/ipv6.h')
-rw-r--r--include/uapi/linux/ipv6.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index e863d088b9a5..b9b1b7d1c839 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -15,16 +15,19 @@
* *under construction*
*/
-
+#if __UAPI_DEF_IN6_PKTINFO
struct in6_pktinfo {
struct in6_addr ipi6_addr;
int ipi6_ifindex;
};
+#endif
+#if __UAPI_DEF_IP6_MTUINFO
struct ip6_mtuinfo {
struct sockaddr_in6 ip6m_addr;
__u32 ip6m_mtu;
};
+#endif
struct in6_ifreq {
struct in6_addr ifr6_addr;