summaryrefslogtreecommitdiffstats
path: root/kernel/net/rds
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/net/rds')
-rw-r--r--kernel/net/rds/recv.c2
-rw-r--r--kernel/net/rds/tcp.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/net/rds/recv.c b/kernel/net/rds/recv.c
index a00462b0d..0514af3ab 100644
--- a/kernel/net/rds/recv.c
+++ b/kernel/net/rds/recv.c
@@ -545,5 +545,7 @@ void rds_inc_info_copy(struct rds_incoming *inc,
minfo.fport = inc->i_hdr.h_dport;
}
+ minfo.flags = 0;
+
rds_info_copy(iter, &minfo, sizeof(minfo));
}
diff --git a/kernel/net/rds/tcp.c b/kernel/net/rds/tcp.c
index 9d6ddbacd..18e50a8fc 100644
--- a/kernel/net/rds/tcp.c
+++ b/kernel/net/rds/tcp.c
@@ -421,7 +421,7 @@ static int rds_tcp_init(void)
ret = rds_tcp_recv_init();
if (ret)
- goto out_slab;
+ goto out_pernet;
ret = rds_trans_register(&rds_tcp_transport);
if (ret)
@@ -433,8 +433,9 @@ static int rds_tcp_init(void)
out_recv:
rds_tcp_recv_exit();
-out_slab:
+out_pernet:
unregister_pernet_subsys(&rds_tcp_net_ops);
+out_slab:
kmem_cache_destroy(rds_tcp_conn_slab);
out:
return ret;