3 files changed, 19 insertions, 14 deletions

diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index d65ed7c69063..0adafdb273f0 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -29,7 +29,7 @@ struct p9_client {
         spinlock_t lock; /* protect client structure */
         int msize;
         unsigned char dotu;
-        struct p9_transport *trans;
+        struct p9_trans *trans;
         struct p9_conn *conn;
 
         struct p9_idpool *fidpool;
@@ -52,7 +52,7 @@ struct p9_fid {
         struct list_head dlist; /* list of all fids attached to a dentry */
 };
 
-struct p9_client *p9_client_create(struct p9_transport *trans, int msize,
+struct p9_client *p9_client_create(struct p9_trans *trans, int msize,
                                                                 int dotu);
 void p9_client_destroy(struct p9_client *clnt);
 void p9_client_disconnect(struct p9_client *clnt);
diff --git a/include/net/9p/conn.h b/include/net/9p/conn.h
index 583b6a2cb3df..756d8784f953 100644
--- a/include/net/9p/conn.h
+++ b/include/net/9p/conn.h
@@ -42,8 +42,8 @@ struct p9_req;
  */
 typedef void (*p9_conn_req_callback)(struct p9_req *req, void *a);
 
-struct p9_conn *p9_conn_create(struct p9_transport *trans, int msize,
-        unsigned char *dotu);
+struct p9_conn *p9_conn_create(struct p9_trans *trans, int msize,
+                                                        unsigned char *dotu);
 void p9_conn_destroy(struct p9_conn *);
 int p9_conn_rpc(struct p9_conn *m, struct p9_fcall *tc, struct p9_fcall **rc);
 
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
index 462d42279fb0..7c68b3e8e78c 100644
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
@@ -26,24 +26,29 @@
 #ifndef NET_9P_TRANSPORT_H
 #define NET_9P_TRANSPORT_H
 
-enum p9_transport_status {
+enum p9_trans_status {
         Connected,
         Disconnected,
         Hung,
 };
 
-struct p9_transport {
-        enum p9_transport_status status;
+struct p9_trans {
+        enum p9_trans_status status;
         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 (*write) (struct p9_transport *, void *, int);
-        int (*read) (struct p9_transport *, void *, int);
-        void (*close) (struct p9_transport *);
-        unsigned int (*poll)(struct p9_transport *, struct poll_table_struct *);
+struct p9_trans_module {
+        struct list_head list;
+        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_transport *p9_trans_create_tcp(const char *addr, int port);
-struct p9_transport *p9_trans_create_unix(const char *addr);
-struct p9_transport *p9_trans_create_fd(int rfd, int wfd);
+void v9fs_register_trans(struct p9_trans_module *m);
 
 #endif /* NET_9P_TRANSPORT_H */