Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fedfb947 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 44fa2b4b bade732a

net/sunrpc/xprtrdma/svc_rdma_transport.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -679,7 +679,10 @@ static struct svc_xprt *svc_rdma_create(struct svc_serv *serv, 
	int ret;

	int ret;





	dprintk("svcrdma: Creating RDMA socket\n");

	dprintk("svcrdma: Creating RDMA socket\n");



	if (sa->sa_family != AF_INET) {

		dprintk("svcrdma: Address family %d is not supported.\n", sa->sa_family);

		return ERR_PTR(-EAFNOSUPPORT);

	}

	cma_xprt = rdma_create_xprt(serv, 1);

	cma_xprt = rdma_create_xprt(serv, 1);

	if (!cma_xprt)

	if (!cma_xprt)

		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);