From: Thomas Graf <tgraf@suug.ch>
Date: Sat, 28 Jun 2014 07:50:32 +0000 (+0100)
Subject: ip6tnl: Use <netinet/in.h> for in6_addr and stuff
X-Git-Tag: libnl3_2_25~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c2dbdfba58087fae720e2d9621423d1d184cf01;p=thirdparty%2Flibnl.git

ip6tnl: Use <netinet/in.h> for in6_addr and stuff

<linux/in6.h> is not compatible with some versions of <netinet/in.h>.

Cc: Susant Sahani <susant@redhat.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>
---

diff --git a/lib/route/link/ip6tnl.c b/lib/route/link/ip6tnl.c
index ed79e82..9fe1367 100644
--- a/lib/route/link/ip6tnl.c
+++ b/lib/route/link/ip6tnl.c
@@ -30,7 +30,7 @@
 #include <netlink/route/rtnl.h>
 #include <netlink-private/route/link/api.h>
 #include <linux/if_tunnel.h>
-#include <linux/in6.h>
+#include <netinet/in.h>
 
 #define IP6_TNL_ATTR_LINK          (1 << 0)
 #define IP6_TNL_ATTR_LOCAL         (1 << 1)