[src/netbsd-7]: src/sys/netinet6 Pull up following revision(s) (requested by ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/de3a61a99845
branches:  netbsd-7
changeset: 798467:de3a61a99845
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 27 13:39:11 2014 +0000

description:
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.

diffstat:

 sys/netinet6/nd6.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r a8ff14880c8a -r de3a61a99845 sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c        Sun Oct 26 16:48:36 2014 +0000
+++ b/sys/netinet6/nd6.c        Mon Oct 27 13:39:11 2014 +0000
@@ -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 @@
            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) ||