diff options
| author |   Eric Dumazet <edumazet@google.com> | 2016-08-23 11:39:29 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-08-23 23:25:29 -0700 |
| commit | ba2489b0e0113f68a25fe7a563842c2b591829d7 (patch) | |
| tree | 1eb76062dddfc69baabb51a4aba9e69c02908052 | |
| parent | ipv6: tcp: get rid of tcp_v6_clear_sk() (diff) | |
| download | linux-dev-ba2489b0e0113f68a25fe7a563842c2b591829d7.tar.xz linux-dev-ba2489b0e0113f68a25fe7a563842c2b591829d7.zip | |
net: remove clear_sk() method
We no longer use this handler, we can delete it.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sock.h | 1 | ||||
| -rw-r--r-- | net/core/sock.c | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 1bc57609f8e1..c797c57f4d9f 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1020,7 +1020,6 @@ struct proto { void (*unhash)(struct sock *sk); void (*rehash)(struct sock *sk); int (*get_port)(struct sock *sk, unsigned short snum); - void (*clear_sk)(struct sock *sk, int size); /* Keeping track of sockets in use */ #ifdef CONFIG_PROC_FS diff --git a/net/core/sock.c b/net/core/sock.c index 2b09c2967e21..51a730485649 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -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); |