net/sched: act_mirred: Use passed lastuse argument

[cascardo/linux.git] / net / rds / loop.c

diff --git a/net/rds/loop.c b/net/rds/loop.c
index 814173b..f2bf78d 100644 (file)
--- a/net/rds/loop.c
+++ b/net/rds/loop.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/in.h>
 
+#include "rds_single_path.h"
 #include "rds.h"
 #include "loop.h"
 
@@ -101,7 +102,7 @@ static void rds_loop_inc_free(struct rds_incoming *inc)
 }
 
 /* we need to at least give the thread something to succeed */
-static int rds_loop_recv(struct rds_connection *conn)
+static int rds_loop_recv_path(struct rds_conn_path *cp)
 {
        return 0;
 }
@@ -149,13 +150,13 @@ static void rds_loop_conn_free(void *arg)
        kfree(lc);
 }
 
-static int rds_loop_conn_connect(struct rds_connection *conn)
+static int rds_loop_conn_path_connect(struct rds_conn_path *cp)
 {
-       rds_connect_complete(conn);
+       rds_connect_complete(cp->cp_conn);
        return 0;
 }
 
-static void rds_loop_conn_shutdown(struct rds_connection *conn)
+static void rds_loop_conn_path_shutdown(struct rds_conn_path *cp)
 {
 }
 
@@ -184,11 +185,11 @@ void rds_loop_exit(void)
  */
 struct rds_transport rds_loop_transport = {
        .xmit                   = rds_loop_xmit,
-       .recv                   = rds_loop_recv,
+       .recv_path              = rds_loop_recv_path,
        .conn_alloc             = rds_loop_conn_alloc,
        .conn_free              = rds_loop_conn_free,
-       .conn_connect           = rds_loop_conn_connect,
-       .conn_shutdown          = rds_loop_conn_shutdown,
+       .conn_path_connect      = rds_loop_conn_path_connect,
+       .conn_path_shutdown     = rds_loop_conn_path_shutdown,
        .inc_copy_to_user       = rds_message_inc_copy_to_user,
        .inc_free               = rds_loop_inc_free,
        .t_name                 = "loopback",