Quickly backport an IPv6 router expiry fix for multi-homed systems.

diff --git a/ipv6ns.c b/ipv6ns.c
index 8bfac4c852867502f94039ef42fc4f9823f82617..00bc6dfb67b9e9b68904872f4e662052d52f9d2b 100644 (file)
--- a/ipv6ns.c
+++ b/ipv6ns.c
@@ -338,7 +338,8 @@ ipv6ns_handledata(_unused void *arg)
        }
 
        TAILQ_FOREACH(rap, &ipv6_routers, next) {
-               if (memcmp(rap->from.s6_addr, from.sin6_addr.s6_addr,
+               if (rap->iface == ifp &&
+                   memcmp(rap->from.s6_addr, from.sin6_addr.s6_addr,
                    sizeof(rap->from.s6_addr)) == 0)
                        break;
        }