diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:08:31 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:13:17 +0200 |
| commit | 721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch) | |
| tree | 2967ef4e10e2592661f664df4515d67dbc80cfe5 /package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch | |
| parent | 89920e9735cb561dccf1e1f81d35788fd10a655b (diff) | |
| parent | cec266ee1f708f11cc679cb4f81613fa4186003c (diff) | |
| download | buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch')
| -rw-r--r-- | package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch b/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch deleted file mode 100644 index f78a5d6b43..0000000000 --- a/package/iproute2/0001-rdma-sync-some-IP-headers-with-glibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5887ff0922a06d978d3271df9f01fcb04fadc75f Mon Sep 17 00:00:00 2001 -From: Hoang Le <hoang.h.le@dektech.com.au> -Date: Wed, 13 Jun 2018 11:09:56 +0700 -Subject: rdma: sync some IP headers with glibc - -In the commit 9a362cc71a45, new userspace header: - (i.e rdma/rdma_user_cm.h -> linux/in6.h) -is included before the kernel space header: - (i.e utils.h -> resolv.h -> netinet/in.h). - -This leads to unsynchronous some IP headers and compiler got failure -with error: redefinition of some structs IP. - -In this commit, just reorder this including to make them in-sync. - -Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au> -Acked-by: Leon Romanovsky <leonro@mellanox.com> -Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -[Retrieved from: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=5887ff0922a06d978d3271df9f01fcb04fadc75f] ---- - rdma/rdma.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/rdma/rdma.h b/rdma/rdma.h -index fcaf9e6..d4b7ba1 100644 ---- a/rdma/rdma.h -+++ b/rdma/rdma.h -@@ -15,6 +15,7 @@ - #include <string.h> - #include <errno.h> - #include <getopt.h> -+#include <netinet/in.h> - #include <libmnl/libmnl.h> - #include <rdma/rdma_netlink.h> - #include <rdma/rdma_user_cm.h> --- -cgit v1.1 - |
