From owner-p4-projects@FreeBSD.ORG  Wed Oct 31 01:42:31 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38E0716A46C; Wed, 31 Oct 2007 01:42:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3C3516A41A
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 01:42:30 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B5D8113C4B6
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 01:42:30 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9V1gUGr079103
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 01:42:30 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V1gUl8079100
	for perforce@freebsd.org; Wed, 31 Oct 2007 01:42:30 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 31 Oct 2007 01:42:30 GMT
Message-Id: <200710310142.l9V1gUl8079100@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 128380 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2007 01:42:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=128380

Change 128380 by kmacy@kmacy:storage:toestack on 2007/10/31 01:42:27

	don't allocate an mbuf just so we can call arpresolve - 
	arpresolve can now be called with m==NULL 

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#7 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_l2t.c#7 (text+ko) ====

@@ -174,17 +174,12 @@
 		     struct l2t_entry *e)
 {
 	struct rtentry *rt;
-	struct mbuf *m0;
-	
-	if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
-		return (ENOMEM);
 
 	rt = e->neigh;
-	
 again:
 	switch (e->state) {
 	case L2T_STATE_STALE:     /* entry is stale, kick off revalidation */
-		arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt));
+		arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt));
 		mtx_lock(&e->lock);
 		if (e->state == L2T_STATE_STALE)
 			e->state = L2T_STATE_VALID;
@@ -201,8 +196,6 @@
 		mtx_unlock(&e->lock);
 		printf("enqueueing arp request\n");
 		
-		if ((m0 = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
-			return (ENOMEM);
 		/*
 		 * Only the first packet added to the arpq should kick off
 		 * resolution.  However, because the m_gethdr below can fail,
@@ -212,7 +205,9 @@
 		 * entries when there's no memory.
 		 */
 		printf("doing arpresolve\n");	
-		if (arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt)) == 0) {
+		if (arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt)) == 0) {
+			if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
+				return (ENOMEM);
 
 			mtx_lock(&e->lock);
 			if (e->arpq_head)