Commit 24da7990 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

inet: remove inet_sk_copy_descendant() 



This is no longer used, SCTP now uses a private helper.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea416e27

include/linux/ipv6.h

+0 −11
Original line number Diff line number Diff line
@@ -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 && \

include/net/inet_sock.h

+0 −7
Original line number Diff line number Diff line
@@ -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);