From owner-svn-src-all@FreeBSD.ORG  Fri Jan  7 18:14:59 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 340471065670;
	Fri,  7 Jan 2011 18:14:59 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 235018FC1C;
	Fri,  7 Jan 2011 18:14:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p07IExdQ060988;
	Fri, 7 Jan 2011 18:14:59 GMT (envelope-from gnn@svn.freebsd.org)
Received: (from gnn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p07IExJm060986;
	Fri, 7 Jan 2011 18:14:59 GMT (envelope-from gnn@svn.freebsd.org)
Message-Id: <201101071814.p07IExJm060986@svn.freebsd.org>
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Fri, 7 Jan 2011 18:14:59 +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: r217113 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jan 2011 18:14:59 -0000

Author: gnn
Date: Fri Jan  7 18:14:58 2011
New Revision: 217113
URL: http://svn.freebsd.org/changeset/base/217113

Log:
  Adjust ARP hold queue locking.
  
  Submitted by:	Rozhuk Ivan, jhb
  MFC after:	2 weeks

Modified:
  head/sys/netinet/if_ether.c

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Fri Jan  7 16:54:29 2011	(r217112)
+++ head/sys/netinet/if_ether.c	Fri Jan  7 18:14:58 2011	(r217113)
@@ -731,6 +731,9 @@ match:
 		if (la->la_hold != NULL) {
 			struct mbuf *m_hold, *m_hold_next;
 
+			m_hold = la->la_hold;
+			la->la_hold = NULL;
+			la->la_numheld = 0;
 			memcpy(&sa, L3_ADDR(la), sizeof(sa));
 			LLE_WUNLOCK(la);
 			for (m_hold = la->la_hold, la->la_hold = NULL;
@@ -741,8 +744,6 @@ match:
 			}
 		} else
 			LLE_WUNLOCK(la);
-		la->la_hold = NULL;
-		la->la_numheld = 0;
 	} /* end of FIB loop */
 reply:
 	if (op != ARPOP_REQUEST)