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

tcp: md5: remove obsolete md5_add() method 



We no longer use md5_add() method from struct tcp_sock_af_ops

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c05d252

include/net/tcp.h

+0 −4
Original line number Diff line number Diff line
@@ -1462,10 +1462,6 @@ struct tcp_sock_af_ops { 
						  const struct sock *sk,

						  const struct request_sock *req,

						  const struct sk_buff *skb);

	int			(*md5_add) (struct sock *sk,

					    struct sock *addr_sk,

					    u8 *newkey,

					    u8 len);

	int			(*md5_parse) (struct sock *sk,

					      char __user *optval,

					      int optlen);

net/ipv4/tcp_ipv4.c

+0 −8
Original line number Diff line number Diff line
@@ -967,13 +967,6 @@ int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, 
}

EXPORT_SYMBOL(tcp_v4_md5_do_add);



static int tcp_v4_md5_add_func(struct sock *sk, struct sock *addr_sk,

			       u8 *newkey, u8 newkeylen)

{

	return tcp_v4_md5_do_add(sk, inet_sk(addr_sk)->inet_daddr,

				 newkey, newkeylen);

}



int tcp_v4_md5_do_del(struct sock *sk, __be32 addr)

{

	struct tcp_sock *tp = tcp_sk(sk);
@@ -1853,7 +1846,6 @@ EXPORT_SYMBOL(ipv4_specific); 
static const struct tcp_sock_af_ops tcp_sock_ipv4_specific = {

	.md5_lookup		= tcp_v4_md5_lookup,

	.calc_md5_hash		= tcp_v4_md5_hash_skb,

	.md5_add		= tcp_v4_md5_add_func,

	.md5_parse		= tcp_v4_parse_md5_keys,

};

#endif

net/ipv6/tcp_ipv6.c

+0 −9
Original line number Diff line number Diff line
@@ -626,13 +626,6 @@ static int tcp_v6_md5_do_add(struct sock *sk, const struct in6_addr *peer, 
	return 0;

}



static int tcp_v6_md5_add_func(struct sock *sk, struct sock *addr_sk,

			       u8 *newkey, __u8 newkeylen)

{

	return tcp_v6_md5_do_add(sk, &inet6_sk(addr_sk)->daddr,

				 newkey, newkeylen);

}



static int tcp_v6_md5_do_del(struct sock *sk, const struct in6_addr *peer)

{

	struct tcp_sock *tp = tcp_sk(sk);
@@ -1898,7 +1891,6 @@ static const struct inet_connection_sock_af_ops ipv6_specific = { 
static const struct tcp_sock_af_ops tcp_sock_ipv6_specific = {

	.md5_lookup	=	tcp_v6_md5_lookup,

	.calc_md5_hash	=	tcp_v6_md5_hash_skb,

	.md5_add	=	tcp_v6_md5_add_func,

	.md5_parse	=	tcp_v6_parse_md5_keys,

};

#endif
@@ -1930,7 +1922,6 @@ static const struct inet_connection_sock_af_ops ipv6_mapped = { 
static const struct tcp_sock_af_ops tcp_sock_ipv6_mapped_specific = {

	.md5_lookup	=	tcp_v4_md5_lookup,

	.calc_md5_hash	=	tcp_v4_md5_hash_skb,

	.md5_add	=	tcp_v6_md5_add_func,

	.md5_parse	=	tcp_v6_parse_md5_keys,

};

#endif