diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-14 11:26:39 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-14 11:26:39 +1100 |
commit | 88f781b21fee5b3fe3b4b04102a48e37a4a76411 (patch) | |
tree | 480678567bf1a86f59eb7338b6d45e931f08b81a /net | |
parent | b1a50cd2e7a0408d224145f0e02b257dbe117abd (diff) | |
parent | fb89b45cdfdc8bdab93986f1bc1474e313295c31 (diff) |
Merge remote-tracking branch 'v9fs/for-next'
Diffstat (limited to 'net')
-rw-r--r-- | net/9p/client.c | 3 | ||||
-rw-r--r-- | net/9p/trans_fd.c | 2 | ||||
-rw-r--r-- | 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 @@ -1012,9 +1012,6 @@ struct p9_client *p9_client_create(const char *dev_name, char *options) 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(); if (clnt->trans_mod == NULL) { 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, }; |