diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
commit | 0fc24c1ebff281406d66840cbaa6d303bc2cae24 (patch) | |
tree | b3cacbb64fa31671d2f6241f38b5dd31db4a643a /net/9p/trans_rdma.c | |
parent | b9914406fb128bee01b2a23a35eafbc83ff915f0 (diff) | |
parent | 18aa04d882fe72eb59ea2c9e3f78400d85b6535f (diff) |
Merge branch 'rmk-next' into s3c64xx
Diffstat (limited to 'net/9p/trans_rdma.c')
-rw-r--r-- | net/9p/trans_rdma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index 8d6cc4777aa..2f1fe5fc122 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c @@ -45,7 +45,6 @@ #include <net/9p/transport.h> #include <rdma/ib_verbs.h> #include <rdma/rdma_cm.h> -#include <rdma/ib_verbs.h> #define P9_PORT 5640 #define P9_RDMA_SQ_DEPTH 32 @@ -589,6 +588,9 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args) if (IS_ERR(rdma->cm_id)) goto error; + /* Associate the client with the transport */ + client->trans = rdma; + /* Resolve the server's address */ rdma->addr.sin_family = AF_INET; rdma->addr.sin_addr.s_addr = in_aton(addr); @@ -669,7 +671,6 @@ rdma_create_trans(struct p9_client *client, const char *addr, char *args) if (err || (rdma->state != P9_RDMA_CONNECTED)) goto error; - client->trans = rdma; client->status = Connected; return 0; |