diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-12 21:34:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-12 21:34:56 -0400 |
| commit | fedfb947b2235c1085df97cf52f688b808c3a515 (patch) | |
| tree | 5eb0ffcd0eace60c7e206df6f33f9841b452f2b3 /net | |
| parent | 44fa2b4bee5b07d506a7b002b4e2eb73654db7e0 (diff) | |
| parent | bade732a2848e640482c1e99629a90e085d574dd (diff) | |
Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux:
svcrdma: RDMA support not yet compatible with RPC6
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index fd90eb89842b..edea15a54e51 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
| @@ -679,7 +679,10 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv, | |||
| 679 | int ret; | 679 | int ret; |
| 680 | 680 | ||
| 681 | dprintk("svcrdma: Creating RDMA socket\n"); | 681 | dprintk("svcrdma: Creating RDMA socket\n"); |
| 682 | 682 | if (sa->sa_family != AF_INET) { | |
| 683 | dprintk("svcrdma: Address family %d is not supported.\n", sa->sa_family); | ||
| 684 | return ERR_PTR(-EAFNOSUPPORT); | ||
| 685 | } | ||
| 683 | cma_xprt = rdma_create_xprt(serv, 1); | 686 | cma_xprt = rdma_create_xprt(serv, 1); |
| 684 | if (!cma_xprt) | 687 | if (!cma_xprt) |
| 685 | return ERR_PTR(-ENOMEM); | 688 | return ERR_PTR(-ENOMEM); |