From owner-svn-src-projects@FreeBSD.ORG  Sat Dec 13 06:50:52 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 6F9CC1065673;
	Sat, 13 Dec 2008 06:50:52 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 60AC08FC16;
	Sat, 13 Dec 2008 06:50:52 +0000 (UTC)
	(envelope-from kmacy@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 mBD6oqWF021529;
	Sat, 13 Dec 2008 06:50:52 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBD6oqsu021528;
	Sat, 13 Dec 2008 06:50:52 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812130650.mBD6oqsu021528@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 13 Dec 2008 06:50:52 +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: r186028 - 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 06:50:52 -0000

Author: kmacy
Date: Sat Dec 13 06:50:52 2008
New Revision: 186028
URL: http://svn.freebsd.org/changeset/base/186028

Log:
  clarify unlock condition

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

Modified: projects/arpv2_merge_1/sys/netinet6/in6.c
==============================================================================
--- projects/arpv2_merge_1/sys/netinet6/in6.c	Sat Dec 13 06:41:25 2008	(r186027)
+++ projects/arpv2_merge_1/sys/netinet6/in6.c	Sat Dec 13 06:50:52 2008	(r186028)
@@ -2204,12 +2204,12 @@ in6_lltable_lookup(struct lltable *llt, 
 		LLE_WLOCK(lle);
 		lle->la_flags = LLE_DELETED;
 		LLE_WUNLOCK(lle);
-#ifdef INVARIANTS
+#ifdef DIAGNOSTICS
 		log(LOG_INFO, "ifaddr cache = %p  is deleted\n", lle);	
 #endif	
 		lle = (void *)-1;
 	}
-	if (lle != NULL && lle != (void *)-1) {
+	if (LLE_IS_VALID(lle)) {
 		if (flags & LLE_EXCLUSIVE)
 			LLE_WLOCK(lle);
 		else