resolve header file conflict betwen linux/in6.h and netinet/in.h

Go back to kernel version of if_bridge.h and use patched
version of linux/in6.h and libc-compat.h

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index d2de4e67ff9f67cabaafd0659c785045db927e93..ed6868ecebacdd7860890cf3dc9b14f76b5bb623 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -15,6 +15,7 @@
 
 #include <linux/types.h>
 #include <linux/if_ether.h>
+#include <linux/in6.h>
 
 #define SYSFS_BRIDGE_ATTR      "bridge"
 #define SYSFS_BRIDGE_FDB       "brforward"

diff --git a/include/linux/in6.h b/include/linux/in6.h
index cc99dc5c1e1bd30954a2424e30f3a447df74e638..994f4c22d741d922d3f38d420cbb49e1e7dc4816 100644 (file)
--- a/include/linux/in6.h
+++ b/include/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:

diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h
index 629e1046763b7e1ad4ba4621c28dfbb74aa61bf6..9e860a0c81206f4a7d9027d1726039bb6653484a 100644 (file)
--- a/include/linux/libc-compat.h
+++ b/include/linux/libc-compat.h
@@ -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