matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Stephen Hemminger 2014-12-20 12:12:34 -08:00
parent b0d30f7f3f
commit 8a504fc356
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/if_bridge.h
View File

@ -15,6 +15,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/in6.h>
#define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward" #define SYSFS_BRIDGE_FDB "brforward"

3
include/linux/in6.h
View File

@ -149,7 +149,7 @@ struct in6_flowlabel_req {
/* /*
* IPV6 socket options * IPV6 socket options
*/ */
#if __UAPI_DEF_IPV6_OPTIONS
#define IPV6_ADDRFORM 1 #define IPV6_ADDRFORM 1
#define IPV6_2292PKTINFO 2 #define IPV6_2292PKTINFO 2
#define IPV6_2292HOPOPTS 3 #define IPV6_2292HOPOPTS 3
@ -196,6 +196,7 @@ struct in6_flowlabel_req {
#define IPV6_IPSEC_POLICY 34 #define IPV6_IPSEC_POLICY 34
#define IPV6_XFRM_POLICY 35 #define IPV6_XFRM_POLICY 35
#endif
/* /*
* Multicast: * Multicast:

3
include/linux/libc-compat.h
View File

@ -69,6 +69,7 @@
#define __UAPI_DEF_SOCKADDR_IN6 0 #define __UAPI_DEF_SOCKADDR_IN6 0
#define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPV6_MREQ 0
#define __UAPI_DEF_IPPROTO_V6 0 #define __UAPI_DEF_IPPROTO_V6 0
#define __UAPI_DEF_IPV6_OPTIONS 0
#else #else
@ -82,6 +83,7 @@
#define __UAPI_DEF_SOCKADDR_IN6 1 #define __UAPI_DEF_SOCKADDR_IN6 1
#define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPV6_MREQ 1
#define __UAPI_DEF_IPPROTO_V6 1 #define __UAPI_DEF_IPPROTO_V6 1
#define __UAPI_DEF_IPV6_OPTIONS 1
#endif /* _NETINET_IN_H */ #endif /* _NETINET_IN_H */
@ -103,6 +105,7 @@
#define __UAPI_DEF_SOCKADDR_IN6 1 #define __UAPI_DEF_SOCKADDR_IN6 1
#define __UAPI_DEF_IPV6_MREQ 1 #define __UAPI_DEF_IPV6_MREQ 1
#define __UAPI_DEF_IPPROTO_V6 1 #define __UAPI_DEF_IPPROTO_V6 1
#define __UAPI_DEF_IPV6_OPTIONS 1
/* Definitions for xattr.h */ /* Definitions for xattr.h */
#define __UAPI_DEF_XATTR 1 #define __UAPI_DEF_XATTR 1