From owner-p4-projects@FreeBSD.ORG  Fri Oct 19 19:30: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 30F7616A421; Fri, 19 Oct 2007 19:30:49 +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 D965116A41B
	for <perforce@freebsd.org>; Fri, 19 Oct 2007 19:30: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 BC86713C46A
	for <perforce@freebsd.org>; Fri, 19 Oct 2007 19:30: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 l9JJUm5C077132
	for <perforce@freebsd.org>; Fri, 19 Oct 2007 19:30:48 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9JJUm9s077129
	for perforce@freebsd.org; Fri, 19 Oct 2007 19:30:48 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 19 Oct 2007 19:30:48 GMT
Message-Id: <200710191930.l9JJUm9s077129@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 127791 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: Fri, 19 Oct 2007 19:30:49 -0000

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

Change 127791 by kmacy@kmacy_home:ethng on 2007/10/19 19:30:15

	change t3_l2t_get to take an ifnet *

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.c#4 edit
.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.h#4 edit
.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#7 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.c#4 (text+ko) ====

@@ -357,14 +357,14 @@
 }
 
 struct l2t_entry *
-t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh,
-			     unsigned int smt_idx)
+t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh, struct ifnet *ifp)
 {
 	struct l2t_entry *e;
 	struct l2t_data *d = L2DATA(dev);
 	u32 addr = *(u32 *) rt_key(neigh);
 	int ifidx = neigh->rt_ifp->if_index;
 	int hash = arp_hash(addr, ifidx, d);
+	unsigned int smt_idx = ((struct port_info *)ifp->if_softc)->port_id;
 
 	rw_wlock(&d->lock);
 	for (e = d->l2tab[hash].first; e; e = e->next)

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_l2t.h#4 (text+ko) ====

@@ -125,7 +125,7 @@
 void t3_l2e_free(struct l2t_data *d, struct l2t_entry *e);
 void t3_l2t_update(struct t3cdev *dev, struct rtentry *ifp);
 struct l2t_entry *t3_l2t_get(struct t3cdev *dev, struct rtentry *neigh,
-			     unsigned int smt_idx);
+			     struct ifnet *ifp);
 int t3_l2t_send_slow(struct t3cdev *dev, struct mbuf *m,
 		     struct l2t_entry *e);
 void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e);

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_offload.c#7 (text+ko) ====

@@ -1250,7 +1250,7 @@
 	}
 
 	/* Add new L2T entry */
-	e = t3_l2t_get(tdev, new, ((struct port_info *)new->rt_ifp->if_softc)->port_id);
+	e = t3_l2t_get(tdev, new, new->rt_ifp);
 	if (!e) {
 		log(LOG_ERR, "%s: couldn't allocate new l2t entry!\n",
 		       __FUNCTION__);