Module Name: src
Committed By: martin
Date: Mon Oct 27 13:39:11 UTC 2014
Modified Files:
src/sys/netinet6 [netbsd-7]: nd6.c
Log Message:
Pull up following revision(s) (requested by roy in ticket #159):
sys/netinet6/nd6.c: revision 1.153
Tests for neighbour now work correctly on bridge(4) and carp(4) interfaces.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.152.2.1 src/sys/netinet6/nd6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.152 src/sys/netinet6/nd6.c:1.152.2.1
--- src/sys/netinet6/nd6.c:1.152 Fri Jun 6 01:02:47 2014
+++ src/sys/netinet6/nd6.c Mon Oct 27 13:39:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.152 2014/06/06 01:02:47 rmind Exp $ */
+/* $NetBSD: nd6.c,v 1.152.2.1 2014/10/27 13:39:11 martin Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,8 +31,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.152 2014/06/06 01:02:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.152.2.1 2014/10/27 13:39:11 martin Exp $");
+#include "bridge.h"
+#include "carp.h"
#include "opt_ipsec.h"
#include <sys/param.h>
@@ -906,7 +908,7 @@ nd6_lookup1(const struct in6_addr *addr6
rt->rt_flags & (RTF_CLONING | RTF_CLONED) &&
(rt->rt_ifp == ifp
#if NBRIDGE > 0
- || SAME_BRIDGE(rt->rt_ifp->if_bridgeport, ifp->if_bridgeport)
+ || rt->rt_ifp->if_bridge == ifp->if_bridge
#endif
#if NCARP > 0
|| (ifp->if_type == IFT_CARP && rt->rt_ifp == ifp->if_carpdev) ||
