diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2014-12-20 12:15:49 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-22 16:12:36 -0500 |
| commit | 6d08acd2d32e3e877579315dc3202d7a5f336d98 (patch) | |
| tree | 9a0e87d08117275b86f561139082e36272670a8d /include/uapi/linux/in6.h | |
| parent | c51ed18257e731e15541324cd58bd3761d9d3b1c (diff) | |
in6: fix conflict with glibc
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>
Diffstat (limited to 'include/uapi/linux/in6.h')
| -rw-r--r-- | include/uapi/linux/in6.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index 74a2a1773494..79b12b004ade 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/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: |