tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds fedfb947 44fa2b4b

+4 -1
unified split
+4 -1
net/sunrpc/xprtrdma/svc_rdma_transport.c
··· 679 int ret; 680 681 dprintk("svcrdma: Creating RDMA socket\n"); 682 - 683 cma_xprt = rdma_create_xprt(serv, 1); 684 if (!cma_xprt) 685 return ERR_PTR(-ENOMEM);
··· 679 int ret; 680 681 dprintk("svcrdma: Creating RDMA socket\n"); 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 + } 686 cma_xprt = rdma_create_xprt(serv, 1); 687 if (!cma_xprt) 688 return ERR_PTR(-ENOMEM);