]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
rdma: sync some IP headers with glibc
authorHoang Le <hoang.h.le@dektech.com.au>
Wed, 13 Jun 2018 04:09:56 +0000 (11:09 +0700)
committerStephen Hemminger <stephen@networkplumber.org>
Fri, 15 Jun 2018 18:11:51 +0000 (11:11 -0700)
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

index fcaf9e69e07c22453a2e9ba390828a7750427600..d4b7ba1918b13174a3537a198b7a50a63b59caea 100644 (file)
@@ -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>