From f94741fd2832e7abc30fbf6dc13ed627c1fcc01a Mon Sep 17 00:00:00 2001 From: Eric Van Hensbergen Date: Tue, 12 Nov 2013 10:20:03 -0600 Subject: [PATCH] net/9p: remove virtio default hack and set appropriate bits instead A few releases back a patch made virtio the default transport, however it was done in a way which side-stepped the mechanism put in place to allow for this selection. This patch cleans that up while maintaining virtio as the default transport. Signed-off-by: Eric Van Hensbergen --- net/9p/client.c | 3 --- net/9p/trans_fd.c | 2 +- net/9p/trans_virtio.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/net/9p/client.c b/net/9p/client.c index ee8fd6bd4035..a5e4d2dcb03e 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -1011,9 +1011,6 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) if (err < 0) goto destroy_tagpool; - if (!clnt->trans_mod) - clnt->trans_mod = v9fs_get_trans_by_name("virtio"); - if (!clnt->trans_mod) clnt->trans_mod = v9fs_get_default_trans(); diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 9321a7763067..b7bd7f2961bf 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -1048,7 +1048,7 @@ p9_fd_create(struct p9_client *client, const char *addr, char *args) static struct p9_trans_module p9_tcp_trans = { .name = "tcp", .maxsize = MAX_SOCK_BUF, - .def = 1, + .def = 0, .create = p9_fd_create_tcp, .close = p9_fd_close, .request = p9_fd_request, diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 9c5a1aa34d12..cd1e1ede73a4 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -698,7 +698,7 @@ static struct p9_trans_module p9_virtio_trans = { * page in zero copy. */ .maxsize = PAGE_SIZE * (VIRTQUEUE_NUM - 3), - .def = 0, + .def = 1, .owner = THIS_MODULE, };