From owner-p4-projects@FreeBSD.ORG  Wed Jan 30 23:57:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E290A16A473; Wed, 30 Jan 2008 23:57:35 +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 8F8DB16A419
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 23:57:35 +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 8211713C46B
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 23:57:35 +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 m0UNvZm7022971
	for <perforce@freebsd.org>; Wed, 30 Jan 2008 23:57:35 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNvZjN022968
	for perforce@freebsd.org; Wed, 30 Jan 2008 23:57:35 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 30 Jan 2008 23:57:35 GMT
Message-Id: <200801302357.m0UNvZjN022968@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 134508 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, 30 Jan 2008 23:57:36 -0000

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

Change 134508 by kmacy@kmacy:entropy:iwarp on 2008/01/30 23:56:39

	remove aio references

Affected files ...

.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 edit
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 edit
.. //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_defs.h#6 edit

Differences ...

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

@@ -44,7 +44,6 @@
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <sys/priv.h>
-#include <sys/aio.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -1522,14 +1521,6 @@
 #endif			
 		} else
 			return (err);
-	} else if (sopt->sopt_name == TCP_AIO) {
-		aio_op_t **op;
-		
-		if (sopt->sopt_td != NULL)
-			return (EINVAL);
-		op = sopt->sopt_val;
-		*op = t3_aio;
-		return (0);
 	} else {
 		int optval, oldval;
 		struct inpcb *inp;

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 (text+ko) ====

@@ -45,7 +45,6 @@
 #include <sys/syslog.h>
 #include <sys/socketvar.h>
 #include <sys/uio.h>
-#include <sys/aio.h>
 #include <sys/file.h>
 
 #include <machine/bus.h>
@@ -818,43 +817,6 @@
 	return pru_soreceive(so, psa, uio, mp0, controlp, flagsp);
 }
 
-static int
-t3_aio_read(struct socket *so, struct aiocb *cb, struct aiocb *ucb, struct thread *td)
-{
-
-	return (ECANCELED);
-}
-
-static int
-t3_aio_write(struct socket *so, struct aiocb *cb, struct aiocb *ucb, struct thread *td)
-{
-
-	return (ECANCELED);
-}
-
-int
-t3_aio(struct file *fp, struct aiocb *cb, struct aiocb *ucb, struct thread *td)
-{
-	int opcode, error;
-	struct socket *so;
-	
-	opcode = cb->aio_lio_opcode;
-
-	if (fp->f_type != DTYPE_SOCKET)
-		return (EINVAL);
-
-	so = fp->f_data;
-	if ((opcode != LIO_READ) && (opcode != LIO_WRITE))
-		return (ECANCELED);
-	
-	if (opcode == LIO_READ)
-		error = (t3_aio_read(so, cb, ucb, td));
-	else
-		error = (t3_aio_write(so, cb, ucb, td));
-
-	return (error);
-}
-
 void
 t3_install_socket_ops(struct socket *so)
 {

==== //depot/projects/iwarp/sys/dev/cxgb/ulp/tom/cxgb_defs.h#6 (text+ko) ====

@@ -83,8 +83,4 @@
 		    unsigned int len);
 int t3_get_tcb(struct socket *so);
 
-struct aiocb;
-struct file;
-int t3_aio(struct file *, struct aiocb *cb, struct aiocb *ucb, struct thread *td);
-
 #endif