diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-10-06 08:56:54 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 08:56:54 (GMT) |
commit | 38a413cbc2b2834683b21823d964bc2d2f0abb82 (patch) | |
tree | 2c62753bef5068ca9a34f13beee142304d028ec0 /net/core/sock.c | |
parent | 55696b1f664e52b3036f21631f9c2247b667f587 (diff) | |
parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
download | linux-38a413cbc2b2834683b21823d964bc2d2f0abb82.tar.xz |
Merge tag 'v4.3-rc3' into x86/mm, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/sock.c')
-rw-r--r-- | net/core/sock.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index ca2984a..3307c02 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2740,10 +2740,8 @@ static void req_prot_cleanup(struct request_sock_ops *rsk_prot) return; kfree(rsk_prot->slab_name); rsk_prot->slab_name = NULL; - if (rsk_prot->slab) { - kmem_cache_destroy(rsk_prot->slab); - rsk_prot->slab = NULL; - } + kmem_cache_destroy(rsk_prot->slab); + rsk_prot->slab = NULL; } static int req_prot_init(const struct proto *prot) @@ -2828,10 +2826,8 @@ void proto_unregister(struct proto *prot) list_del(&prot->node); mutex_unlock(&proto_list_mutex); - if (prot->slab != NULL) { - kmem_cache_destroy(prot->slab); - prot->slab = NULL; - } + kmem_cache_destroy(prot->slab); + prot->slab = NULL; req_prot_cleanup(prot->rsk_prot); |