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 1e9c69eb86315f6dce3e29abb3863d198bdbb400..75a16eab37fb9beb55ff1d6346682bdae2a2ec02 100644 (file)
--- 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;
 }