From owner-p4-projects@FreeBSD.ORG  Sun Oct 28 22:24:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2326116A475; Sun, 28 Oct 2007 22:24:20 +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 B45E116A46C
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 22:24:19 +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 A43F913C4AC
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 22:24:19 +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 l9SMOJus059413
	for <perforce@freebsd.org>; Sun, 28 Oct 2007 22:24:19 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9SMOJW1059410
	for perforce@freebsd.org; Sun, 28 Oct 2007 22:24:19 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 28 Oct 2007 22:24:19 GMT
Message-Id: <200710282224.l9SMOJW1059410@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 128254 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: Sun, 28 Oct 2007 22:24:20 -0000

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

Change 128254 by kmacy@kmacy:storage:toestack on 2007/10/28 22:23:22

	- add missing symbols
	- don't malloc with M_WAITOK as locks are being held

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 (text+ko) ====

@@ -123,6 +123,14 @@
 
 static struct toe_usrreqs cxgb_toe_usrreqs;
 
+
+void
+t3_enable_ddp(struct socket *so, int on)
+{
+	printf("t3_enable_ddp unimplemented !!!! \n");
+		
+}
+
 static inline void
 so_insert_tid(struct tom_data *d, struct socket *so, unsigned int tid)
 {

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 (text+ko) ====

@@ -115,6 +115,13 @@
 };
 
 void
+toepcb_init(struct toepcb *toep)
+{
+	bzero(toep, sizeof(*toep));
+	
+}
+
+void
 toepcb_hold(struct toepcb *toep)
 {
 	atomic_add_acq_int(&toep->tp_refcount, 1);
@@ -150,7 +157,7 @@
 	struct toedev *tdev;
 	struct adap_ports *port_info;
 
-	t = malloc(sizeof(*t), M_DEVBUF, M_WAITOK|M_ZERO);
+	t = malloc(sizeof(*t), M_DEVBUF, M_NOWAIT|M_ZERO);
 	
 	if (!t)
 		return;
@@ -158,7 +165,7 @@
 	if (cdev->ctl(cdev, GET_WR_LEN, &wr_len) < 0)
 		goto out_free_tom;
 
-	port_info = malloc(sizeof(*port_info), M_DEVBUF, M_WAITOK|M_ZERO);
+	port_info = malloc(sizeof(*port_info), M_DEVBUF, M_NOWAIT|M_ZERO);
 	if (!port_info)
 		goto out_free_tom;
 
@@ -368,6 +375,9 @@
 #ifdef notyet
 	register_listen_offload_notifier(&listen_notifier);
 #endif
+	TAILQ_INIT(&cxgb_list);
+	
+	mtx_init(&cxgb_list_lock, "cxgb tom list", NULL, MTX_DEF);
 	/* Register to offloading devices */
 	t3c_tom_client.add = t3c_tom_add;
 	cxgb_register_client(&t3c_tom_client);