From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 10 07:45:11 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 C4C271065672;
	Wed, 10 Dec 2008 07:45:11 +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 AFDB08FC16;
	Wed, 10 Dec 2008 07:45:11 +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 mBA7jBSj022280;
	Wed, 10 Dec 2008 07:45:11 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBA7jBDd022279;
	Wed, 10 Dec 2008 07:45:11 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812100745.mBA7jBDd022279@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 10 Dec 2008 07:45:11 +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: r185841 - 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: Wed, 10 Dec 2008 07:45:11 -0000

Author: kmacy
Date: Wed Dec 10 07:45:11 2008
New Revision: 185841
URL: http://svn.freebsd.org/changeset/base/185841

Log:
  we might be renewing the lookup without la_hold set

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	Wed Dec 10 07:14:51 2008	(r185840)
+++ projects/arpv2_merge_1/sys/netinet/if_ether.c	Wed Dec 10 07:45:11 2008	(r185841)
@@ -325,17 +325,18 @@ retry:
 	}
 
 	renew = (la->la_asked == 0 || la->la_expire != time_uptime);
+
+	if (renew && ((flags & LLE_EXCLUSIVE) == 0)) {
+		flags |= LLE_EXCLUSIVE;
+		LLE_RUNLOCK(la);
+		goto retry;
+	}
 	/*
 	 * There is an arptab entry, but no ethernet address
 	 * response yet.  Replace the held mbuf with this
 	 * latest one.
 	 */
 	if (m) {
-		if ((flags & LLE_EXCLUSIVE) == 0) {
-			flags |= LLE_EXCLUSIVE;
-			LLE_RUNLOCK(la);
-			goto retry;
-		}
 		if (la->la_hold)
 			m_freem(la->la_hold);
 		la->la_hold = m;