1 files changed, 29 insertions, 7 deletions

diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h
index 53b1d56a6e7f..440d5c479145 100644
--- a/include/uapi/linux/in6.h
+++ b/include/uapi/linux/in6.h
@@ -22,22 +22,30 @@
 #define _UAPI_LINUX_IN6_H
 
 #include <linux/types.h>
+#include <linux/libc-compat.h>
 
 /*
  *      IPv6 address structure
  */
 
+#if __UAPI_DEF_IN6_ADDR
 struct in6_addr {
         union {
                 __u8            u6_addr8[16];
+#if __UAPI_DEF_IN6_ADDR_ALT
                 __be16          u6_addr16[8];
                 __be32          u6_addr32[4];
+#endif
         } in6_u;
 #define s6_addr                 in6_u.u6_addr8
+#if __UAPI_DEF_IN6_ADDR_ALT
 #define s6_addr16               in6_u.u6_addr16
 #define s6_addr32               in6_u.u6_addr32
+#endif
 };
+#endif /* __UAPI_DEF_IN6_ADDR */
 
+#if __UAPI_DEF_SOCKADDR_IN6
 struct sockaddr_in6 {
         unsigned short int      sin6_family;    /* AF_INET6 */
         __be16                  sin6_port;      /* Transport layer port # */
@@ -45,7 +53,9 @@ struct sockaddr_in6 {
         struct in6_addr         sin6_addr;      /* IPv6 address */
         __u32                   sin6_scope_id;  /* scope id (new in RFC2553) */
 };
+#endif /* __UAPI_DEF_SOCKADDR_IN6 */
 
+#if __UAPI_DEF_IPV6_MREQ
 struct ipv6_mreq {
         /* IPv6 multicast address of group */
         struct in6_addr ipv6mr_multiaddr;
@@ -53,6 +63,7 @@ struct ipv6_mreq {
         /* local IPv6 address of interface */
         int             ipv6mr_ifindex;
 };
+#endif /* __UAPI_DEF_IVP6_MREQ */
 
 #define ipv6mr_acaddr   ipv6mr_multiaddr
 
@@ -114,13 +125,24 @@ struct in6_flowlabel_req {
 /*
  *      IPV6 extension headers
  */
-#define IPPROTO_HOPOPTS         0       /* IPv6 hop-by-hop options      */
-#define IPPROTO_ROUTING         43      /* IPv6 routing header          */
-#define IPPROTO_FRAGMENT        44      /* IPv6 fragmentation header    */
-#define IPPROTO_ICMPV6          58      /* ICMPv6                       */
-#define IPPROTO_NONE            59      /* IPv6 no next header          */
-#define IPPROTO_DSTOPTS         60      /* IPv6 destination options     */
-#define IPPROTO_MH              135     /* IPv6 mobility header         */
+#if __UAPI_DEF_IPPROTO_V6
+enum {
+  IPPROTO_HOPOPTS = 0,          /* IPv6 hop-by-hop options      */
+#define IPPROTO_HOPOPTS         IPPROTO_HOPOPTS
+  IPPROTO_ROUTING = 43,         /* IPv6 routing header          */
+#define IPPROTO_ROUTING         IPPROTO_ROUTING
+  IPPROTO_FRAGMENT = 44,        /* IPv6 fragmentation header    */
+#define IPPROTO_FRAGMENT        IPPROTO_FRAGMENT
+  IPPROTO_ICMPV6 = 58,          /* ICMPv6                       */
+#define IPPROTO_ICMPV6          IPPROTO_ICMPV6
+  IPPROTO_NONE = 59,            /* IPv6 no next header          */
+#define IPPROTO_NONE            IPPROTO_NONE
+  IPPROTO_DSTOPTS = 60,         /* IPv6 destination options     */
+#define IPPROTO_DSTOPTS         IPPROTO_DSTOPTS
+  IPPROTO_MH = 135,             /* IPv6 mobility header         */
+#define IPPROTO_MH              IPPROTO_MH
+};
+#endif /* __UAPI_DEF_IPPROTO_V6 */
 
 /*
  *      IPv6 TLV options.