in6: fix conflict with glibc

PATCH In review Stephen Hemminger 3 participants 3 messages Dec 20, 2014 – Dec 22, 2014

Subsystems (3)

Networking Network drivers ABI/API

lore

Share & tools

lore

Stephen Hemminger

author

2014-12-20 20:15 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
Patch against -net tree

include/uapi/linux/in6.h +2 -1

@@ -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

@@ -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

Hannes Frederic Sowa

Acked-by on v1 1/1

2014-12-21 13:56 UTC #1 lore raw

Quoted 8 lines · Stephen Hemminger

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 <[email protected]>

Acked-by Hannes Frederic Sowa <[email protected]>

David Miller

2014-12-22 21:13 UTC #2 lore raw

In reply to Stephen Hemminger

From: Stephen Hemminger <[email protected]>
Date: Sat, 20 Dec 2014 12:15:49 -0800

Quoted 11 lines

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 <[email protected]>
---
Patch against -net tree

Applied and queued up for -stable, thanks Stephen.