summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorIra Weiny <ira.weiny@intel.com>2015-05-14 21:01:46 +0200
committerDoug Ledford <dledford@redhat.com>2015-05-20 21:58:19 +0200
commit5d9fb0440698a8b9e8595353d60cfac7ab30efae (patch)
tree9b6fed56e074c9564ec60d0bcf6fc21a3b453ed9 /net
parentIB/core: Convert core to use bitfield for caps (diff)
downloadlinux-5d9fb0440698a8b9e8595353d60cfac7ab30efae.tar.xz
linux-5d9fb0440698a8b9e8595353d60cfac7ab30efae.zip
IB/core: Change rdma_protocol_iboe to roce
After discussion upstream, it was agreed to transition the usage of iboe in the kernel to roce. This keeps our terminology consistent with what was finalized in the IBTA Annex 16 and IBTA Annex 17 publications. Signed-off-by: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma_transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 3df8320c6efe..3f5750cf187e 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -987,7 +987,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
*/
if (!rdma_protocol_iwarp(newxprt->sc_cm_id->device,
newxprt->sc_cm_id->port_num) &&
- !rdma_ib_or_iboe(newxprt->sc_cm_id->device,
+ !rdma_ib_or_roce(newxprt->sc_cm_id->device,
newxprt->sc_cm_id->port_num))
goto errout;