Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39d8cda7 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[SOCK]: Add udp_hash member to struct proto. 



Inspired by the commit ab1e0a13 ([SOCK] proto: Add hashinfo member to 
struct proto) from Arnaldo, I made similar thing for UDP/-Lite IPv4 
and -v6 protocols.

The result is not that exciting, but it removes some levels of
indirection in udpxxx_get_port and saves some space in code and text.

The first step is to union existing hashinfo and new udp_hash on the
struct proto and give a name to this union, since future initialization 
of tcpxxx_prot, dccp_vx_protinfo and udpxxx_protinfo will cause gcc 
warning about inability to initialize anonymous member this way.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22aba383

include/net/inet_hashtables.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static inline int inet_sk_listen_hashfn(const struct sock *sk) 
/* Caller must disable local BH processing. */

static inline void __inet_inherit_port(struct sock *sk, struct sock *child)

{

	struct inet_hashinfo *table = sk->sk_prot->hashinfo;

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

	const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);

	struct inet_bind_hashbucket *head = &table->bhash[bhash];

	struct inet_bind_bucket *tb;

include/net/sock.h

+4 −1
Original line number Diff line number Diff line
@@ -586,7 +586,10 @@ struct proto { 
	struct request_sock_ops	*rsk_prot;

	struct timewait_sock_ops *twsk_prot;



	union {

		struct inet_hashinfo	*hashinfo;

		struct hlist_head	*udp_hash;

	} h;



	struct module		*owner;

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ static struct proto dccp_v4_prot = { 
	.obj_size		= sizeof(struct dccp_sock),

	.rsk_prot		= &dccp_request_sock_ops,

	.twsk_prot		= &dccp_timewait_sock_ops,

	.hashinfo		= &dccp_hashinfo,

	.h.hashinfo		= &dccp_hashinfo,

#ifdef CONFIG_COMPAT

	.compat_setsockopt	= compat_dccp_setsockopt,

	.compat_getsockopt	= compat_dccp_getsockopt,

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static struct proto dccp_v6_prot = { 
	.obj_size	   = sizeof(struct dccp6_sock),

	.rsk_prot	   = &dccp6_request_sock_ops,

	.twsk_prot	   = &dccp6_timewait_sock_ops,

	.hashinfo	   = &dccp_hashinfo,

	.h.hashinfo	   = &dccp_hashinfo,

#ifdef CONFIG_COMPAT

	.compat_setsockopt = compat_dccp_setsockopt,

	.compat_getsockopt = compat_dccp_getsockopt,

net/ipv4/inet_connection_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ EXPORT_SYMBOL_GPL(inet_csk_bind_conflict); 
 */

int inet_csk_get_port(struct sock *sk, unsigned short snum)

{

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

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

	struct inet_bind_hashbucket *head;

	struct hlist_node *node;

	struct inet_bind_bucket *tb;