From owner-svn-src-projects@FreeBSD.ORG  Sat Dec 13 08:31:33 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 349E5106564A;
	Sat, 13 Dec 2008 08:31:33 +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 24D7E8FC22;
	Sat, 13 Dec 2008 08:31:33 +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 mBD8VW8A023464;
	Sat, 13 Dec 2008 08:31:32 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBD8VWKF023463;
	Sat, 13 Dec 2008 08:31:32 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812130831.mBD8VWKF023463@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 13 Dec 2008 08:31:32 +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: r186032 - projects/arpv2_merge_1/sys/netinet
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 08:31:33 -0000

Author: kmacy
Date: Sat Dec 13 08:31:32 2008
New Revision: 186032
URL: http://svn.freebsd.org/changeset/base/186032

Log:
  hold lle lock across flags check

Modified:
  projects/arpv2_merge_1/sys/netinet/if_ether.c

Modified: projects/arpv2_merge_1/sys/netinet/if_ether.c
==============================================================================
--- projects/arpv2_merge_1/sys/netinet/if_ether.c	Sat Dec 13 07:45:48 2008	(r186031)
+++ projects/arpv2_merge_1/sys/netinet/if_ether.c	Sat Dec 13 08:31:32 2008	(r186032)
@@ -154,19 +154,20 @@ arptimer(void *arg)
 		return;
 	}
 	ifp = lle->lle_tbl->llt_ifp;
+	IF_AFDATA_LOCK(ifp);
+	LLE_WLOCK(lle);
 	if ((lle->la_flags & LLE_DELETED) ||
 	    (time_second >= lle->la_expire)) {
-		IF_AFDATA_LOCK(ifp);
 		if (!callout_pending(&lle->la_timer) &&
 		    callout_active(&lle->la_timer))
 			(void) llentry_free(lle);
-		IF_AFDATA_UNLOCK(ifp);
 	} else {
 		/*
 		 * Still valid, just drop our reference
 		 */
-		LLE_FREE(lle);
+		LLE_FREE_LOCKED(lle);
 	}
+	IF_AFDATA_UNLOCK(ifp);
 }
 
 /*