PERFORCE change 134508 for review
Kip Macy
kmacy at FreeBSD.org
Wed Jan 30 15:57:36 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=134508
Change 134508 by kmacy at 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
More information about the p4-projects
mailing list