From 8a0dc95fd976a052e5e799ef33e6c8e3141b5dff Mon Sep 17 00:00:00 2001 From: Eric Van Hensbergen Date: Wed, 6 Feb 2008 19:25:03 -0600 Subject: 9p: transport API reorganization This merges the mux.c (including the connection interface) with trans_fd in preparation for transport API changes. Ultimately, trans_fd will need to be rewritten to clean it up and simplify the implementation, but this reorganization is viewed as the first step. Signed-off-by: Eric Van Hensbergen --- include/net/9p/transport.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'include/net/9p/transport.h') diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h index f9f362e934c9..d2209ae9d18b 100644 --- a/include/net/9p/transport.h +++ b/include/net/9p/transport.h @@ -4,7 +4,7 @@ * Transport Definition * * Copyright (C) 2005 by Latchesar Ionkov - * Copyright (C) 2004 by Eric Van Hensbergen + * Copyright (C) 2004-2008 by Eric Van Hensbergen * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -34,13 +34,12 @@ enum p9_trans_status { struct p9_trans { enum p9_trans_status status; + int msize; + unsigned char extended; void *priv; - int (*write) (struct p9_trans *, void *, int); - int (*read) (struct p9_trans *, void *, int); void (*close) (struct p9_trans *); - unsigned int (*poll)(struct p9_trans *, struct poll_table_struct *); int (*rpc) (struct p9_trans *t, struct p9_fcall *tc, - struct p9_fcall **rc, int msize, int dotu); + struct p9_fcall **rc); }; struct p9_trans_module { @@ -48,7 +47,7 @@ struct p9_trans_module { char *name; /* name of transport */ int maxsize; /* max message size of transport */ int def; /* this transport should be default */ - struct p9_trans * (*create)(const char *devname, char *options); + struct p9_trans * (*create)(const char *, char *, int, unsigned char); }; void v9fs_register_trans(struct p9_trans_module *m); -- cgit v1.2.1