diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-23 23:25:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-23 23:25:37 -0700 |
| commit | e53ee45435465aa8fb87eb2e01503d55159b3c6a (patch) | |
| tree | 1eb76062dddfc69baabb51a4aba9e69c02908052 /include | |
| parent | 5d77dca82839ef016a93ad7acd7058b14d967752 (diff) | |
| parent | ba2489b0e0113f68a25fe7a563842c2b591829d7 (diff) | |
Merge branch 'remove-clear_sk'
Eric Dumazet says:
====================
net: remove clear_sk() method
Since IPv6 socket lookups no longer dereference pinet6 pointer
and UDP lost SLAB_DESTROY_BY_RCU special rules, we no longer
need special clear_sk() methods.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 2aab9b63bf16..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 @@ -1242,8 +1241,6 @@ static inline int __sk_prot_rehash(struct sock *sk) return sk->sk_prot->hash(sk); } -void sk_prot_clear_portaddr_nulls(struct sock *sk, int size); - /* About 10 seconds */ #define SOCK_DESTROY_TIME (10*HZ) |