[src/trunk]: src/sys/netinet6 Tests for neighbour now work correctly on bridg...

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

details:   https://anonhg.NetBSD.org/src/rev/22e877f39647
branches:  trunk
changeset: 333014:22e877f39647
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Oct 14 15:29:43 2014 +0000

description:
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 5baa17d8d18d -r 22e877f39647 sys/netinet6/nd6.c
--- a/sys/netinet6/nd6.c        Tue Oct 14 13:53:34 2014 +0000
+++ b/sys/netinet6/nd6.c        Tue Oct 14 15:29:43 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.153 2014/10/14 15:29:43 roy 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.153 2014/10/14 15:29:43 roy 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) ||