Update to the latest version of iproute2; see https://lwn.net/Articles/762515/ for a full overview of the changes in 4.18. Remove upstream patch 001-rdma-sync-some-IP-headers-with-glibc Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>master
parent
d9792152fd
commit
8fd8e79143
@ -1,37 +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: [PATCH] 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>
|
|
||||||
---
|
|
||||||
rdma/rdma.h | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/rdma/rdma.h b/rdma/rdma.h
|
|
||||||
index fcaf9e69..d4b7ba19 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>
|
|
||||||
--
|
|
||||||
2.16.3
|
|
||||||
|
|
Loading…
Reference in new issue