Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d08acd2 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

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: default avatarStephen Hemminger <stephen@networkplumber.org>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c51ed182

include/uapi/linux/in6.h

+2 −1
Original line number Diff line number Diff line
@@ -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:

include/uapi/linux/libc-compat.h

+3 −0
Original line number Diff line number Diff line
@@ -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