diff options
| author | stephen hemminger <stephen@networkplumber.org> | 2014-12-20 12:15:49 -0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-01-19 11:19:05 +0000 |
| commit | 4a70ed9df748e4eb3bfeb4f9aad94b9a6a2837bf (patch) | |
| tree | 12be7865e9f308619f4516a2173b3cb2c4eab862 /include/uapi/linux/in6.h | |
| parent | e5048768a193913ccc17774ca58d333510497770 (diff) | |
in6: fix conflict with glibc
commit 6d08acd2d32e3e877579315dc3202d7a5f336d98 upstream.
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: Luis Henriques <luis.henriques@canonical.com>
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 0d8e0f0342dc..1a663d83d765 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: |