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

ipv6: get rid of __inet6_hash() 



We can now use inet_hash() and __inet_hash() instead of private
functions.

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

include/net/inet6_hashtables.h

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ static inline unsigned int __inet6_ehashfn(const u32 lhash, 
	return jhash_3words(lhash, fhash, ports, initval);

}



int __inet6_hash(struct sock *sk, struct inet_timewait_sock *twp);



/*

 * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so

 * we need not check it for TCP lookups anymore, thanks Alexey. -DaveM

include/net/inet_hashtables.h

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ void inet_put_port(struct sock *sk); 
void inet_hashinfo_init(struct inet_hashinfo *h);



int __inet_hash_nolisten(struct sock *sk, struct inet_timewait_sock *tw);

int __inet_hash(struct sock *sk, struct inet_timewait_sock *tw);

void inet_hash(struct sock *sk);

void inet_unhash(struct sock *sk);

net/dccp/ipv6.c

+2 −15
Original line number Diff line number Diff line
@@ -40,19 +40,6 @@ 
static const struct inet_connection_sock_af_ops dccp_ipv6_mapped;

static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops;



static void dccp_v6_hash(struct sock *sk)

{

	if (sk->sk_state != DCCP_CLOSED) {

		if (inet_csk(sk)->icsk_af_ops == &dccp_ipv6_mapped) {

			inet_hash(sk);

			return;

		}

		local_bh_disable();

		__inet6_hash(sk, NULL);

		local_bh_enable();

	}

}



/* add pseudo-header to DCCP checksum stored in skb->csum */

static inline __sum16 dccp_v6_csum_finish(struct sk_buff *skb,

				      const struct in6_addr *saddr,
@@ -588,7 +575,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
		dccp_done(newsk);

		goto out;

	}

	__inet6_hash(newsk, NULL);

	__inet_hash(newsk, NULL);



	return newsk;
@@ -1056,7 +1043,7 @@ static struct proto dccp_v6_prot = { 
	.sendmsg	   = dccp_sendmsg,

	.recvmsg	   = dccp_recvmsg,

	.backlog_rcv	   = dccp_v6_do_rcv,

	.hash		   = dccp_v6_hash,

	.hash		   = inet_hash,

	.unhash		   = inet_unhash,

	.accept		   = inet_csk_accept,

	.get_port	   = inet_csk_get_port,

net/ipv4/inet_hashtables.c

+6 −6
Original line number Diff line number Diff line
@@ -434,15 +434,13 @@ int __inet_hash_nolisten(struct sock *sk, struct inet_timewait_sock *tw) 
}

EXPORT_SYMBOL_GPL(__inet_hash_nolisten);



static void __inet_hash(struct sock *sk)

int __inet_hash(struct sock *sk, struct inet_timewait_sock *tw)

{

	struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;

	struct inet_listen_hashbucket *ilb;



	if (sk->sk_state != TCP_LISTEN) {

		__inet_hash_nolisten(sk, NULL);

		return;

	}

	if (sk->sk_state != TCP_LISTEN)

		return __inet_hash_nolisten(sk, tw);



	WARN_ON(!sk_unhashed(sk));

	ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];
@@ -451,13 +449,15 @@ static void __inet_hash(struct sock *sk) 
	__sk_nulls_add_node_rcu(sk, &ilb->head);

	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);

	spin_unlock(&ilb->lock);

	return 0;

}

EXPORT_SYMBOL(__inet_hash);



void inet_hash(struct sock *sk)

{

	if (sk->sk_state != TCP_CLOSE) {

		local_bh_disable();

		__inet_hash(sk);

		__inet_hash(sk, NULL);

		local_bh_enable();

	}

}

net/ipv6/inet6_hashtables.c

+1 −37
Original line number Diff line number Diff line
@@ -42,42 +42,6 @@ u32 inet6_ehashfn(const struct net *net, 
			       inet6_ehash_secret + net_hash_mix(net));

}



int __inet6_hash(struct sock *sk, struct inet_timewait_sock *tw)

{

	struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;

	int twrefcnt = 0;



	WARN_ON(!sk_unhashed(sk));



	if (sk->sk_state == TCP_LISTEN) {

		struct inet_listen_hashbucket *ilb;



		ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn(sk)];

		spin_lock(&ilb->lock);

		__sk_nulls_add_node_rcu(sk, &ilb->head);

		spin_unlock(&ilb->lock);

	} else {

		unsigned int hash;

		struct hlist_nulls_head *list;

		spinlock_t *lock;



		sk->sk_hash = hash = sk_ehashfn(sk);

		list = &inet_ehash_bucket(hashinfo, hash)->chain;

		lock = inet_ehash_lockp(hashinfo, hash);

		spin_lock(lock);

		__sk_nulls_add_node_rcu(sk, list);

		if (tw) {

			WARN_ON(sk->sk_hash != tw->tw_hash);

			twrefcnt = inet_twsk_unhash(tw);

		}

		spin_unlock(lock);

	}



	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);

	return twrefcnt;

}

EXPORT_SYMBOL(__inet6_hash);



/*

 * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so

 * we need not check it for TCP lookups anymore, thanks Alexey. -DaveM
@@ -306,6 +270,6 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row, 
		       struct sock *sk)

{

	return __inet_hash_connect(death_row, sk, inet6_sk_port_offset(sk),

			__inet6_check_established, __inet6_hash);

			__inet6_check_established, __inet_hash_nolisten);

}

EXPORT_SYMBOL_GPL(inet6_hash_connect);