diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-06 10:35:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-06 10:35:22 -0700 |
| commit | 30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa (patch) | |
| tree | 87302af9e03ee50cf135cc9ce6589f41fe3b3db1 /net/rds/tcp.c | |
| parent | ae3e4562e2ce0149a4424c994a282955700711e7 (diff) | |
| parent | bc86765181aa26cc9afcb0a6f9f253cbb1186f26 (diff) | |
| download | linux-30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa.tar.gz linux-30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa.tar.bz2 linux-30d0844bdcea9fb8b0b3c8abfa5547bc3bcf8baa.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/usb/r8152.c
All three conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/tcp.c')
| -rw-r--r-- | net/rds/tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index d278432f080b..d24f6c142d03 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -651,7 +651,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) @@ -663,8 +663,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; |