[iproute2,1/1] rdma: sync some IP headers with glibc

Message ID 1528862996-7045-1-git-send-email-hoang.h.le@dektech.com.au
State Accepted
Delegated to: stephen hemminger
Headers show
Series
  • [iproute2,1/1] rdma: sync some IP headers with glibc
Related show

Commit Message

Hoang Le June 13, 2018, 4:09 a.m.
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>
---
 rdma/rdma.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Leon Romanovsky June 14, 2018, 1:52 p.m. | #1
On Wed, Jun 13, 2018 at 11:09:56AM +0700, Hoang Le wrote:
> 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>
> ---
>  rdma/rdma.h | 1 +
>  1 file changed, 1 insertion(+)
>

Thanks,
Acked-by: Leon Romanovsky <leonro@mellanox.com>
Stephen Hemminger June 15, 2018, 6:19 p.m. | #2
On Wed, 13 Jun 2018 11:09:56 +0700
Hoang Le <hoang.h.le@dektech.com.au> wrote:

> 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>

Sure applied

Patch

diff --git a/rdma/rdma.h b/rdma/rdma.h
index fcaf9e69e07c..d4b7ba1918b1 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>