diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-02-14 10:55:09 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-03-07 16:30:54 +0100 |
| commit | 836c52da5f3890a52b43ed1ce7e88a68a1ac0d07 (patch) | |
| tree | 095d3904fdeef321cd8c5773b165592aa039c1ea /nhrpd/netlink_gre.c | |
| parent | doc: add initial nhrpd documentation (diff) | |
| download | frr-836c52da5f3890a52b43ed1ce7e88a68a1ac0d07.tar.xz frr-836c52da5f3890a52b43ed1ce7e88a68a1ac0d07.zip | |
nhrpd: workaround old kernel vs. glibc definition conflics
fixes https://bugzilla.quagga.net/show_bug.cgi?id=908
With kernel-headers-3.10.0 we have:
In file included from netlink_gre.c:15:0:
/usr/include/linux/ipv6.h:19:8: error: redefinition of 'struct in6_pktinfo'
struct in6_pktinfo {
^
In file included from netlink_gre.c:10:0:
/usr/include/netinet/in.h:536:8: note: originally defined here
struct in6_pktinfo
^
In file included from netlink_gre.c:15:0:
/usr/include/linux/ipv6.h:24:8: error: redefinition of 'struct ip6_mtuinfo'
struct ip6_mtuinfo {
^
In file included from netlink_gre.c:10:0:
/usr/include/netinet/in.h:543:8: note: originally defined here
struct ip6_mtuinfo
So instead of libc's netinet/in.h include kernel's linux/in.h
and the add sys/socket.h for struct sockaddr since it does not
seem to be defined in kernel headers.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'nhrpd/netlink_gre.c')
| -rw-r--r-- | nhrpd/netlink_gre.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nhrpd/netlink_gre.c b/nhrpd/netlink_gre.c index 7cd30aa30..93998dc5f 100644 --- a/nhrpd/netlink_gre.c +++ b/nhrpd/netlink_gre.c @@ -7,9 +7,10 @@ * (at your option) any later version. */ -#include <netinet/in.h> +#include <sys/socket.h> #include <linux/netlink.h> #include <linux/rtnetlink.h> +#include <linux/in.h> #include <linux/if.h> #include <linux/ip.h> #include <linux/ipv6.h> |