From owner-p4-projects@FreeBSD.ORG  Wed Oct 31 05:42:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BC1B516A47D; Wed, 31 Oct 2007 05:42:48 +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 4668216A477
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 05:42:48 +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 361A913C447
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 05:42:48 +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 l9V5gmOA015259
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 05:42:48 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V5gmBp015256
	for perforce@freebsd.org; Wed, 31 Oct 2007 05:42:48 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 31 Oct 2007 05:42:48 GMT
Message-Id: <200710310542.l9V5gmBp015256@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 128392 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 05:42:49 -0000

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

Change 128392 by kmacy@kmacy:storage:toestack on 2007/10/31 05:42:44

	resolve the host interface MAC address not the non-existent gateway

Affected files ...

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

Differences ...

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

@@ -179,7 +179,7 @@
 again:
 	switch (e->state) {
 	case L2T_STATE_STALE:     /* entry is stale, kick off revalidation */
-		arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt));
+		arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), RT_ENADDR(rt));
 		mtx_lock(&e->lock);
 		if (e->state == L2T_STATE_STALE)
 			e->state = L2T_STATE_VALID;
@@ -205,7 +205,7 @@
 		 * entries when there's no memory.
 		 */
 		printf("doing arpresolve\n");	
-		if (arpresolve(rt->rt_ifp, rt, NULL, rt->rt_gateway, RT_ENADDR(rt)) == 0) {
+		if (arpresolve(rt->rt_ifp, rt, NULL, rt_key(rt), RT_ENADDR(rt)) == 0) {
 			if ((m = m_gethdr(M_NOWAIT, MT_DATA)) == NULL)
 				return (ENOMEM);
 
@@ -235,7 +235,7 @@
 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, m0, rt_key(rt), RT_ENADDR(rt));
 		mtx_lock(&e->lock);
 		if (e->state == L2T_STATE_STALE) {
 			e->state = L2T_STATE_VALID;
@@ -262,7 +262,7 @@
 		 * A better way would be to use a work request to retry L2T
 		 * entries when there's no memory.
 		 */
-		arpresolve(rt->rt_ifp, rt, m0, rt->rt_gateway, RT_ENADDR(rt));
+		arpresolve(rt->rt_ifp, rt, m0, rt_key(rt), RT_ENADDR(rt));
 
 	}
 	return;
@@ -302,6 +302,7 @@
 			}
 		e->state = L2T_STATE_UNUSED;
 	}
+	
 	return e;
 }
 
@@ -392,6 +393,8 @@
 		e->ifindex = ifidx;
 		e->smt_idx = smt_idx;
 		atomic_store_rel_int(&e->refcnt, 1);
+		e->neigh = NULL;
+		
 		neigh_replace(e, neigh);
 #ifdef notyet
 		/*