From owner-p4-projects@FreeBSD.ORG  Wed Oct 31 22:22:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2BCA216A46B; Wed, 31 Oct 2007 22:22:09 +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 D91D816A420
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 22:22:08 +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 C78CA13C4AA
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 22:22:08 +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 l9VMM8wg039954
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 22:22:08 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9VMM8c8039951
	for perforce@freebsd.org; Wed, 31 Oct 2007 22:22:08 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 31 Oct 2007 22:22:08 GMT
Message-Id: <200710312222.l9VMM8c8039951@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 128432 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 22:22:09 -0000

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

Change 128432 by kmacy@kmacy:storage:toestack on 2007/10/31 22:21:20

	- free unreferenced rtentry
	- remove bogus la_hold check
	- call arpresolve to update rtentry before copying into l2t entry

Affected files ...

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

Differences ...

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

@@ -105,8 +105,7 @@
 	
 	if (e->neigh) {
 		RT_LOCK(e->neigh);
-		RT_REMREF(e->neigh);
-		RT_UNLOCK(e->neigh);
+		RTFREE_LOCKED(e->neigh);
 	}
 	e->neigh = rt;
 }
@@ -454,7 +453,9 @@
 	int ifidx = neigh->rt_ifp->if_index;
 	int hash = arp_hash(addr, ifidx, d);
 	struct llinfo_arp *la;
-	
+
+	arpresolve(neigh->rt_ifp, neigh, NULL, rt_key(neigh), RT_ENADDR(neigh));
+	    
 	rw_rlock(&d->lock);
 	for (e = d->l2tab[hash].first; e; e = e->next)
 		if (e->addr == addr && e->ifindex == ifidx) {
@@ -476,11 +477,10 @@
 			if (la->la_asked >= 5 /* arp_maxtries */) {
 				arpq = e->arpq_head;
 				e->arpq_head = e->arpq_tail = NULL;
-			} else if (la->la_hold == NULL)
+			} else
 				setup_l2e_send_pending(dev, NULL, e);
 		} else {
-			e->state = (la->la_hold == NULL) ?
-				L2T_STATE_VALID : L2T_STATE_STALE;
+			e->state = L2T_STATE_VALID;
 			if (memcmp(e->dmac, RT_ENADDR(neigh), 6))
 				setup_l2e_send_pending(dev, NULL, e);
 		}