mirror of
https://github.com/pygos/build.git
synced 2024-11-18 09:19:46 +01:00
128 lines
3.5 KiB
Diff
128 lines
3.5 KiB
Diff
--- a/rdma/include/uapi/rdma/rdma_user_cm.h
|
|
+++ b/rdma/include/uapi/rdma/rdma_user_cm.h
|
|
@@ -37,5 +37,5 @@
|
|
#include <linux/types.h>
|
|
#include <linux/socket.h>
|
|
-#include <linux/in6.h>
|
|
+#include <netinet/in.h>
|
|
#include <rdma/ib_user_verbs.h>
|
|
#include <rdma/ib_user_sa.h>
|
|
--- a/include/uapi/linux/if_tunnel.h
|
|
+++ b/include/uapi/linux/if_tunnel.h
|
|
@@ -3,7 +3,6 @@
|
|
#define _IF_TUNNEL_H_
|
|
|
|
#include <linux/types.h>
|
|
-#include <linux/if.h>
|
|
#include <linux/ip.h>
|
|
#include <linux/in6.h>
|
|
#include <asm/byteorder.h>
|
|
--- a/include/uapi/linux/ip6_tunnel.h
|
|
+++ b/include/uapi/linux/ip6_tunnel.h
|
|
@@ -3,7 +3,6 @@
|
|
#define _IP6_TUNNEL_H
|
|
|
|
#include <linux/types.h>
|
|
-#include <linux/if.h> /* For IFNAMSIZ. */
|
|
#include <linux/in6.h> /* For struct in6_addr. */
|
|
|
|
#define IPV6_TLV_TNL_ENCAP_LIMIT 4
|
|
--- a/include/uapi/linux/kernel.h
|
|
+++ b/include/uapi/linux/kernel.h
|
|
@@ -2,7 +2,9 @@
|
|
#ifndef _LINUX_KERNEL_H
|
|
#define _LINUX_KERNEL_H
|
|
|
|
+#ifdef __GLIBC__
|
|
#include <linux/sysinfo.h>
|
|
+#endif
|
|
|
|
/*
|
|
* 'kernel.h' contains some often-used function prototypes etc
|
|
--- a/include/uapi/linux/libc-compat.h
|
|
+++ b/include/uapi/linux/libc-compat.h
|
|
@@ -50,8 +50,8 @@
|
|
#define _LIBC_COMPAT_H
|
|
|
|
/* We have included glibc headers... */
|
|
-#if defined(__GLIBC__)
|
|
+#if !defined(__KERNEL__)
|
|
|
|
/* Coordinate with glibc net/if.h header. */
|
|
-#if defined(_NET_IF_H) && defined(__USE_MISC)
|
|
+#if defined(_NET_IF_H)
|
|
|
|
@@ -65,9 +65,13 @@
|
|
/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
|
|
#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
|
|
/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
|
|
+#if !defined(__GLIBC__)
|
|
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
|
|
+#else
|
|
#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
|
|
#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
|
|
#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
|
|
+#endif /* !defined(__GLIBC__) */
|
|
|
|
#else /* _NET_IF_H */
|
|
|
|
@@ -86,6 +90,13 @@
|
|
|
|
#endif /* _NET_IF_H */
|
|
|
|
+#ifdef _NETINET_IF_ETHER_H
|
|
+#define __UAPI_DEF_ETHHDR 0
|
|
+#else
|
|
+/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */
|
|
+#define __UAPI_DEF_ETHHDR 1
|
|
+#endif /* _NETINET_IF_ETHER_H */
|
|
+
|
|
/* Coordinate with glibc netinet/in.h header. */
|
|
#if defined(_NETINET_IN_H)
|
|
|
|
@@ -99,15 +110,7 @@
|
|
#define __UAPI_DEF_IN_CLASS 0
|
|
|
|
#define __UAPI_DEF_IN6_ADDR 0
|
|
-/* The exception is the in6_addr macros which must be defined
|
|
- * if the glibc code didn't define them. This guard matches
|
|
- * the guard in glibc/inet/netinet/in.h which defines the
|
|
- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
|
|
-#if defined(__USE_MISC) || defined (__USE_GNU)
|
|
#define __UAPI_DEF_IN6_ADDR_ALT 0
|
|
-#else
|
|
-#define __UAPI_DEF_IN6_ADDR_ALT 1
|
|
-#endif
|
|
#define __UAPI_DEF_SOCKADDR_IN6 0
|
|
#define __UAPI_DEF_IPV6_MREQ 0
|
|
#define __UAPI_DEF_IPPROTO_V6 0
|
|
@@ -194,6 +197,9 @@
|
|
#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
|
|
#endif
|
|
|
|
+/* Definitions for if/ether.h */
|
|
+#define __UAPI_DEF_ETHHDR 1
|
|
+
|
|
/* Definitions for in.h */
|
|
#ifndef __UAPI_DEF_IN_ADDR
|
|
#define __UAPI_DEF_IN_ADDR 1
|
|
--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
|
|
+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
|
|
@@ -18,7 +18,6 @@
|
|
|
|
#include <linux/types.h>
|
|
|
|
-#include <linux/if.h>
|
|
#include <linux/netfilter_ipv4.h>
|
|
|
|
#include <linux/netfilter/x_tables.h>
|
|
--- a/tc/f_flower.c
|
|
+++ b/tc/f_flower.c
|
|
@@ -15,6 +15,6 @@
|
|
#include <string.h>
|
|
#include <net/if.h>
|
|
-#include <linux/if_arp.h>
|
|
+#include <net/if_arp.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/ip.h>
|
|
#include <linux/tc_act/tc_vlan.h>
|