|
@@ -1326,12 +1326,8 @@ static struct sock *sk_prot_alloc(struct proto *prot, gfp_t priority,
|
|
|
sk = kmem_cache_alloc(slab, priority & ~__GFP_ZERO);
|
|
|
if (!sk)
|
|
|
return sk;
|
|
|
- if (priority & __GFP_ZERO) {
|
|
|
- if (prot->clear_sk)
|
|
|
- prot->clear_sk(sk, prot->obj_size);
|
|
|
- else
|
|
|
- sk_prot_clear_nulls(sk, prot->obj_size);
|
|
|
- }
|
|
|
+ if (priority & __GFP_ZERO)
|
|
|
+ sk_prot_clear_nulls(sk, prot->obj_size);
|
|
|
} else
|
|
|
sk = kmalloc(prot->obj_size, priority);
|
|
|
|