diff options
| author |   Eric Dumazet <edumazet@google.com> | 2020-08-26 06:50:16 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-08-26 07:33:19 -0700 |
| commit | 24da79902efc4a8443fae09e6c8e25b515bd8db2 (patch) | |
| tree | 5dd5f12ed3b73391eaa52c1375312cfe19783690 | |
| parent | ptp: ptp_ines: Remove redundant null check (diff) | |
| download | linux-dev-24da79902efc4a8443fae09e6c8e25b515bd8db2.tar.xz linux-dev-24da79902efc4a8443fae09e6c8e25b515bd8db2.zip | |
inet: remove inet_sk_copy_descendant()
This is no longer used, SCTP now uses a private helper.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/ipv6.h | 11 | ||||
| -rw-r--r-- | include/net/inet_sock.h | 7 |
2 files changed, 0 insertions, 18 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index a44789d027cc..bac8f4fffbd6 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -345,17 +345,6 @@ static inline struct raw6_sock *raw6_sk(const struct sock *sk) return (struct raw6_sock *)sk; } -static inline void inet_sk_copy_descendant(struct sock *sk_to, - const struct sock *sk_from) -{ - int ancestor_size = sizeof(struct inet_sock); - - if (sk_from->sk_family == PF_INET6) - ancestor_size += sizeof(struct ipv6_pinfo); - - __inet_sk_copy_descendant(sk_to, sk_from, ancestor_size); -} - #define __ipv6_only_sock(sk) (sk->sk_ipv6only) #define ipv6_only_sock(sk) (__ipv6_only_sock(sk)) #define ipv6_sk_rxinfo(sk) ((sk)->sk_family == PF_INET6 && \ diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index a3702d1d4875..89163ef8cf4b 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -296,13 +296,6 @@ static inline void __inet_sk_copy_descendant(struct sock *sk_to, memcpy(inet_sk(sk_to) + 1, inet_sk(sk_from) + 1, sk_from->sk_prot->obj_size - ancestor_size); } -#if !(IS_ENABLED(CONFIG_IPV6)) -static inline void inet_sk_copy_descendant(struct sock *sk_to, - const struct sock *sk_from) -{ - __inet_sk_copy_descendant(sk_to, sk_from, sizeof(struct inet_sock)); -} -#endif int inet_sk_rebuild_header(struct sock *sk); |