From: Timo Teräs <timo.teras@iki.fi>
Date: Fri, 19 May 2017 11:08:35 +0000 (+0300)
Subject: nhrpd: configure mgre ipv6 nd for nhrp
X-Git-Tag: reindent-master-before~132^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=896868a63ea796e507498917686a07099d4353a8;p=matthieu%2Ffrr.git

nhrpd: configure mgre ipv6 nd for nhrp

Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/nhrpd/linux.c b/nhrpd/linux.c
index 1e9c69eb86..75a16eab37 100644
--- a/nhrpd/linux.c
+++ b/nhrpd/linux.c
@@ -138,16 +138,16 @@ static int linux_icmp_redirect_off(const char *iface)
 
 int os_configure_dmvpn(unsigned int ifindex, const char *ifname, int af)
 {
-	int ret = -1;
+	int ret = 0;
 
 	switch (af) {
 	case AF_INET:
-		ret  = linux_icmp_redirect_off("all");
+		ret |= linux_icmp_redirect_off("all");
 		ret |= linux_icmp_redirect_off(ifname);
-		ret |= netlink_configure_arp(ifindex, AF_INET);
-		ret |= linux_configure_arp(ifname, 1);
 		break;
 	}
+	ret |= linux_configure_arp(ifname, 1);
+	ret |= netlink_configure_arp(ifindex, af);
 
 	return ret;
 }