From owner-svn-src-projects@FreeBSD.ORG  Sat Dec 13 23:24:04 2008
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E59781065672;
	Sat, 13 Dec 2008 23:24:04 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5F028FC12;
	Sat, 13 Dec 2008 23:24:04 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDNO4qN042895;
	Sat, 13 Dec 2008 23:24:04 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBDNO43J042894;
	Sat, 13 Dec 2008 23:24:04 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200812132324.mBDNO43J042894@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Sat, 13 Dec 2008 23:24:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186065 - projects/arpv2_merge_1/sys/netinet6
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Dec 2008 23:24:05 -0000

Author: qingli
Date: Sat Dec 13 23:24:04 2008
New Revision: 186065
URL: http://svn.freebsd.org/changeset/base/186065

Log:
  The meaning of the return code from nd6_is_addr_neighbor()
  was reversed, causing all sorts of ...

Modified:
  projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c

Modified: projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c
==============================================================================
--- projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c	Sat Dec 13 23:10:36 2008	(r186064)
+++ projects/arpv2_merge_1/sys/netinet6/nd6_nbr.c	Sat Dec 13 23:24:04 2008	(r186065)
@@ -117,7 +117,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 	struct ifaddr *ifa = NULL;
 	int lladdrlen = 0;
 	int anycast = 0, proxy = 0, tentative = 0;
-	int tlladdr, error;
+	int tlladdr;
 	union nd_opts ndopts;
 	struct sockaddr_dl *proxydl = NULL;
 	char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
@@ -171,8 +171,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 		src_sa6.sin6_family = AF_INET6;
 		src_sa6.sin6_len = sizeof(src_sa6);
 		src_sa6.sin6_addr = saddr6;
-		error = nd6_is_addr_neighbor(&src_sa6, ifp);
-		if (error) {
+		if (nd6_is_addr_neighbor(&src_sa6, ifp) == 0) {
 			nd6log((LOG_INFO, "nd6_ns_input: "
 				"NS packet from non-neighbor\n"));
 			goto bad;