7e82418372
Update to the latest version of iproute2; see https://lwn.net/Articles/756991/ for a full overview of the changes in 4.17. Remove upstream patch 002-json_print-fix-hidden-64-bit-type-promotion. Backport upstream patch 001-rdma-sync-some-IP-headers-with-glibc fixing rdma compile issue. At the same time re-organize patch numbering so the OpenWRT specific patches start at 100. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
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
|
|
|