From owner-svn-src-head@FreeBSD.ORG  Tue Dec 16 03:05:18 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A9AC106564A;
	Tue, 16 Dec 2008 03:05:18 +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 767338FC1D;
	Tue, 16 Dec 2008 03:05:18 +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 mBG35ILG024732;
	Tue, 16 Dec 2008 03:05:18 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBG35Ixe024731;
	Tue, 16 Dec 2008 03:05:18 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812160305.mBG35Ixe024731@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 16 Dec 2008 03:05:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186162 - head/sys/netinet6
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Dec 2008 03:05:18 -0000

Author: kmacy
Date: Tue Dec 16 03:05:18 2008
New Revision: 186162
URL: http://svn.freebsd.org/changeset/base/186162

Log:
  simplify locking in find_pfxlist_reachable_router

Modified:
  head/sys/netinet6/nd6_rtr.c

Modified: head/sys/netinet6/nd6_rtr.c
==============================================================================
--- head/sys/netinet6/nd6_rtr.c	Tue Dec 16 02:48:12 2008	(r186161)
+++ head/sys/netinet6/nd6_rtr.c	Tue Dec 16 03:05:18 2008	(r186162)
@@ -1329,19 +1329,20 @@ find_pfxlist_reachable_router(struct nd_
 {
 	struct nd_pfxrouter *pfxrtr;
 	struct llentry *ln;
+	int canreach;
 
 	for (pfxrtr = LIST_FIRST(&pr->ndpr_advrtrs); pfxrtr;
 	     pfxrtr = LIST_NEXT(pfxrtr, pfr_entry)) {
 		IF_AFDATA_LOCK(pfxrtr->router->ifp);
-		if (((ln = nd6_lookup(&pfxrtr->router->rtaddr, 0,
-				pfxrtr->router->ifp)) != NULL) &&
-		    ND6_IS_LLINFO_PROBREACH(ln)) {
-			LLE_RUNLOCK(ln); 
-			break;	/* found */
-		}
-		if (ln != NULL) 
-			LLE_RUNLOCK(ln); 
+		ln = nd6_lookup(&pfxrtr->router->rtaddr, 0, pfxrtr->router->ifp);
 		IF_AFDATA_UNLOCK(pfxrtr->router->ifp);
+		canreach = 0;		
+		if (ln != NULL) {			
+			canreach = ND6_IS_LLINFO_PROBREACH(ln);
+			LLE_RUNLOCK(ln);
+		}
+		if (canreach)
+			break;
 	}
 	return (pfxrtr);
 }