Merge tag 'ntb-4.8' of git://github.com/jonmason/ntb

[deliverable/linux.git] / net / rds / ib.c

diff --git a/net/rds/ib.c b/net/rds/ib.c
index b5342fddaf984e73fa1c566833685e9cbb940b05..7eaf887e46f8ef12ffd7d72aeadb7d0e15459851 100644 (file)
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -40,6 +40,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 
+#include "rds_single_path.h"
 #include "rds.h"
 #include "ib.h"
 #include "ib_mr.h"
@@ -380,15 +381,15 @@ void rds_ib_exit(void)
 
 struct rds_transport rds_ib_transport = {
        .laddr_check            = rds_ib_laddr_check,
-       .xmit_complete          = rds_ib_xmit_complete,
+       .xmit_path_complete     = rds_ib_xmit_path_complete,
        .xmit                   = rds_ib_xmit,
        .xmit_rdma              = rds_ib_xmit_rdma,
        .xmit_atomic            = rds_ib_xmit_atomic,
-       .recv                   = rds_ib_recv,
+       .recv_path              = rds_ib_recv_path,
        .conn_alloc             = rds_ib_conn_alloc,
        .conn_free              = rds_ib_conn_free,
-       .conn_connect           = rds_ib_conn_connect,
-       .conn_shutdown          = rds_ib_conn_shutdown,
+       .conn_path_connect      = rds_ib_conn_path_connect,
+       .conn_path_shutdown     = rds_ib_conn_path_shutdown,
        .inc_copy_to_user       = rds_ib_inc_copy_to_user,
        .inc_free               = rds_ib_inc_free,
        .cm_initiate_connect    = rds_ib_cm_initiate_connect,