From: Stephen Hemminger Date: Sat, 20 Dec 2014 20:12:34 +0000 (-0800) Subject: resolve header file conflict betwen linux/in6.h and netinet/in.h X-Git-Tag: v3.18.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a504fc35660aa46003b2b68dd3a8777bf77179a;p=thirdparty%2Fiproute2.git resolve header file conflict betwen linux/in6.h and netinet/in.h Go back to kernel version of if_bridge.h and use patched version of linux/in6.h and libc-compat.h --- diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index d2de4e67f..ed6868ece 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -15,6 +15,7 @@ #include #include +#include #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" diff --git a/include/linux/in6.h b/include/linux/in6.h index cc99dc5c1..994f4c22d 100644 --- a/include/linux/in6.h +++ b/include/linux/in6.h @@ -149,7 +149,7 @@ struct in6_flowlabel_req { /* * IPV6 socket options */ - +#if __UAPI_DEF_IPV6_OPTIONS #define IPV6_ADDRFORM 1 #define IPV6_2292PKTINFO 2 #define IPV6_2292HOPOPTS 3 @@ -196,6 +196,7 @@ struct in6_flowlabel_req { #define IPV6_IPSEC_POLICY 34 #define IPV6_XFRM_POLICY 35 +#endif /* * Multicast: diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h index 629e10467..9e860a0c8 100644 --- a/include/linux/libc-compat.h +++ b/include/linux/libc-compat.h @@ -69,6 +69,7 @@ #define __UAPI_DEF_SOCKADDR_IN6 0 #define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPPROTO_V6 0 +#define __UAPI_DEF_IPV6_OPTIONS 0 #else @@ -82,6 +83,7 @@ #define __UAPI_DEF_SOCKADDR_IN6 1 #define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPPROTO_V6 1 +#define __UAPI_DEF_IPV6_OPTIONS 1 #endif /* _NETINET_IN_H */ @@ -103,6 +105,7 @@ #define __UAPI_DEF_SOCKADDR_IN6 1 #define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPPROTO_V6 1 +#define __UAPI_DEF_IPV6_OPTIONS 1 /* Definitions for xattr.h */ #define __UAPI_DEF_XATTR 1