summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSripathi Kodi <sripathik@in.ibm.com>2010-03-05 18:51:04 +0000
committerEric Van Hensbergen <ericvh@gmail.com>2010-03-05 15:04:42 -0600
commitc5a7697da9775f7a0e122fa23180becc311772d1 (patch)
treec1113133d1f99cb00a636780242a4c99810b540e /net
parent342fee1d5c7dfa05f4e14ec1e583df4553b09776 (diff)
downloadlinux-stable-c5a7697da9775f7a0e122fa23180becc311772d1.tar.gz
linux-stable-c5a7697da9775f7a0e122fa23180becc311772d1.tar.bz2
linux-stable-c5a7697da9775f7a0e122fa23180becc311772d1.zip
9P2010.L handshake: .L protocol negotiation
This patch adds 9P2010.L protocol negotiation with the server Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net')
-rw-r--r--net/9p/client.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/net/9p/client.c b/net/9p/client.c
index 9994676e57da..bde9f3d38c57 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -670,8 +670,25 @@ int p9_client_version(struct p9_client *c)
P9_DPRINTK(P9_DEBUG_9P, ">>> TVERSION msize %d protocol %d\n",
c->msize, c->proto_version);
- req = p9_client_rpc(c, P9_TVERSION, "ds", c->msize,
- p9_is_proto_dotu(c) ? "9P2000.u" : "9P2000");
+
+ switch (c->proto_version) {
+ case p9_proto_2010L:
+ req = p9_client_rpc(c, P9_TVERSION, "ds",
+ c->msize, "9P2010.L");
+ break;
+ case p9_proto_2000u:
+ req = p9_client_rpc(c, P9_TVERSION, "ds",
+ c->msize, "9P2000.u");
+ break;
+ case p9_proto_legacy:
+ req = p9_client_rpc(c, P9_TVERSION, "ds",
+ c->msize, "9P2000");
+ break;
+ default:
+ return -EINVAL;
+ break;
+ }
+
if (IS_ERR(req))
return PTR_ERR(req);
@@ -683,7 +700,9 @@ int p9_client_version(struct p9_client *c)
}
P9_DPRINTK(P9_DEBUG_9P, "<<< RVERSION msize %d %s\n", msize, version);
- if (!strncmp(version, "9P2000.u", 8))
+ if (!strncmp(version, "9P2010.L", 8))
+ c->proto_version = p9_proto_2010L;
+ else if (!strncmp(version, "9P2000.u", 8))
c->proto_version = p9_proto_2000u;
else if (!strncmp(version, "9P2000", 6))
c->proto_version = p9_proto_legacy;