diff options
| author | Eric Van Hensbergen <ericvh@gmail.com> | 2013-11-12 10:20:03 -0600 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@gmail.com> | 2013-11-23 16:13:36 -0600 |
| commit | f94741fd2832e7abc30fbf6dc13ed627c1fcc01a (patch) | |
| tree | e40c58a53f78e0f3699ffb6cbafa2e5bc5200f3e /net/9p | |
| parent | dd2a0a35c3121a88af3c2228a0bc497b5e4a7f56 (diff) | |
| download | op-kernel-dev-f94741fd2832e7abc30fbf6dc13ed627c1fcc01a.zip op-kernel-dev-f94741fd2832e7abc30fbf6dc13ed627c1fcc01a.tar.gz | |
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 <ericvh@gmail.com>
Diffstat (limited to 'net/9p')
| -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 ee8fd6b..a5e4d2d 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 9321a77..b7bd7f2 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 9c5a1aa..cd1e1ed 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, }; |
