diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2014-12-20 12:15:49 -0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-01-26 14:39:14 +0100 |
| commit | ef260858f4bdef913410e825b1f9590a0b9db213 (patch) | |
| tree | c99bb22442599f21396f50b007e58454f390b54f /include | |
| parent | d7ab02d6e980a50530a2f92056b653de1c114285 (diff) | |
| download | lwn-ef260858f4bdef913410e825b1f9590a0b9db213.tar.gz lwn-ef260858f4bdef913410e825b1f9590a0b9db213.zip | |
in6: fix conflict with glibc
[ Upstream commit 6d08acd2d32e3e877579315dc3202d7a5f336d98 ]
Resolve conflicts between glibc definition of IPV6 socket options
and those defined in Linux headers. Looks like earlier efforts to
solve this did not cover all the definitions.
It resolves warnings during iproute2 build.
Please consider for stable as well.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/in6.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/libc-compat.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index 440d5c479145..599b0d4c2d1c 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/linux/in6.h @@ -156,7 +156,7 @@ enum { /* * IPV6 socket options */ - +#if __UAPI_DEF_IPV6_OPTIONS #define IPV6_ADDRFORM 1 #define IPV6_2292PKTINFO 2 #define IPV6_2292HOPOPTS 3 @@ -195,6 +195,7 @@ enum { #define IPV6_IPSEC_POLICY 34 #define IPV6_XFRM_POLICY 35 +#endif /* * Multicast: diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index c140620dad92..e28807ad17fa 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/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 |