  #define __UAPI_DEF_SOCKADDR_IN6		0
  #define __UAPI_DEF_IPV6_MREQ		0
  #define __UAPI_DEF_IPPROTO_V6		0
- #define __UAPI_DEF_IPV6_OPTIONS		0
+@@ -73,13 +64,13 @@
+ #define __UAPI_DEF_IN6_PKTINFO		0
+ #define __UAPI_DEF_IP6_MTUINFO		0
  
 -#else
 +#else /* defined(_NETINET_IN_H) */

 
 /* Definitions for in6.h */
 #define __UAPI_DEF_IN6_ADDR		1
@@ -110,6 +101,6 @@
 /* Definitions for xattr.h */
 #define __UAPI_DEF_XATTR		1
 

 generic/include/linux/libc-compat.h | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

Index: linux-4.1/include/uapi/linux/libc-compat.h
===================================================================
--- linux-4.1.orig/include/uapi/linux/libc-compat.h
+++ linux-4.1/include/uapi/linux/libc-compat.h
@@ -48,24 +48,15 @@
 #ifndef _UAPI_LIBC_COMPAT_H
 #define _UAPI_LIBC_COMPAT_H
 
