Commit 0ac44301 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

tcp: Remove inet6_hash(). 



inet_hash() and inet6_hash() are exactly the same.

Also, we do not need to export inet6_hash().

Let's consolidate the two into __inet_hash() and rename it to inet_hash().

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250919083706.1863217-3-kuniyu@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6445bb83

include/net/inet6_hashtables.h

+0 −2
Original line number Diff line number Diff line
@@ -167,8 +167,6 @@ struct sock *inet6_lookup(const struct net *net, struct sk_buff *skb, int doff, 
			  const struct in6_addr *daddr, const __be16 dport,

			  const int dif);



int inet6_hash(struct sock *sk);



static inline bool inet6_match(const struct net *net, const struct sock *sk,

			       const struct in6_addr *saddr,

			       const struct in6_addr *daddr,

include/net/inet_hashtables.h

+0 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ int inet_hashinfo2_init_mod(struct inet_hashinfo *h); 
bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk);

bool inet_ehash_nolisten(struct sock *sk, struct sock *osk,

			 bool *found_dup_sk);

int __inet_hash(struct sock *sk);

int inet_hash(struct sock *sk);

void inet_unhash(struct sock *sk);

net/ipv4/inet_hashtables.c

+5 −12
Original line number Diff line number Diff line
@@ -739,12 +739,15 @@ static int inet_reuseport_add_sock(struct sock *sk, 
	return reuseport_alloc(sk, inet_rcv_saddr_any(sk));

}



int __inet_hash(struct sock *sk)

int inet_hash(struct sock *sk)

{

	struct inet_hashinfo *hashinfo = tcp_get_hashinfo(sk);

	struct inet_listen_hashbucket *ilb2;

	int err = 0;



	if (sk->sk_state == TCP_CLOSE)

		return 0;



	if (sk->sk_state != TCP_LISTEN) {

		local_bh_disable();

		inet_ehash_nolisten(sk, NULL, NULL);
@@ -772,17 +775,7 @@ int __inet_hash(struct sock *sk) 


	return err;

}

EXPORT_IPV6_MOD(__inet_hash);



int inet_hash(struct sock *sk)

{

	int err = 0;



	if (sk->sk_state != TCP_CLOSE)

		err = __inet_hash(sk);



	return err;

}

EXPORT_IPV6_MOD(inet_hash);



void inet_unhash(struct sock *sk)

{

net/ipv6/inet6_hashtables.c

+0 −11
Original line number Diff line number Diff line
@@ -368,14 +368,3 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row, 
				   __inet6_check_established);

}

EXPORT_SYMBOL_GPL(inet6_hash_connect);
 


int inet6_hash(struct sock *sk)

{

	int err = 0;



	if (sk->sk_state != TCP_CLOSE)

		err = __inet_hash(sk);



	return err;

}

EXPORT_SYMBOL_GPL(inet6_hash);

net/ipv6/tcp_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -2355,7 +2355,7 @@ struct proto tcpv6_prot = { 
	.splice_eof		= tcp_splice_eof,

	.backlog_rcv		= tcp_v6_do_rcv,

	.release_cb		= tcp_release_cb,

	.hash			= inet6_hash,

	.hash			= inet_hash,

	.unhash			= inet_unhash,

	.get_port		= inet_csk_get_port,

	.put_port		= inet_put_port,