From owner-svn-src-head@FreeBSD.ORG  Wed Dec 24 05:31:27 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 193641065670;
	Wed, 24 Dec 2008 05:31:27 +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 086778FC16;
	Wed, 24 Dec 2008 05:31:27 +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 mBO5VQbL024445;
	Wed, 24 Dec 2008 05:31:26 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBO5VQ8S024444;
	Wed, 24 Dec 2008 05:31:26 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812240531.mBO5VQ8S024444@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 24 Dec 2008 05:31:26 +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: r186474 - head/sys/netinet
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: Wed, 24 Dec 2008 05:31:27 -0000

Author: kmacy
Date: Wed Dec 24 05:31:26 2008
New Revision: 186474
URL: http://svn.freebsd.org/changeset/base/186474

Log:
  Fix missed unlock and reference drop of lle
  
  Found by: pho

Modified:
  head/sys/netinet/if_ether.c

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Wed Dec 24 04:44:39 2008	(r186473)
+++ head/sys/netinet/if_ether.c	Wed Dec 24 05:31:26 2008	(r186474)
@@ -156,12 +156,12 @@ arptimer(void *arg)
 	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 (!callout_pending(&lle->la_timer) &&
-		    callout_active(&lle->la_timer))
-			(void) llentry_free(lle);
-	} else {
+	if (((lle->la_flags & LLE_DELETED)
+		|| (time_second >= lle->la_expire))
+	    && (!callout_pending(&lle->la_timer) &&
+		callout_active(&lle->la_timer)))
+		(void) llentry_free(lle);
+	else {
 		/*
 		 * Still valid, just drop our reference
 		 */