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

Commit 11b58ba1 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

netlink: Use default rhashtable hashfn 



This patch removes the explicit jhash value for the hashfn parameter
of rhashtable.  As the key length is a multiple of 4, this means that
we will actually end up using jhash2.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31ccde2d

net/netlink/af_netlink.c

+1 −2
Original line number Diff line number Diff line
@@ -3133,13 +3133,12 @@ static inline u32 netlink_hash(const void *data, u32 seed) 
	struct netlink_compare_arg arg;



	netlink_compare_arg_init(&arg, sock_net(&nlk->sk), nlk->portid);

	return jhash(&arg, netlink_compare_arg_len, seed);

	return jhash2((u32 *)&arg, netlink_compare_arg_len / sizeof(u32), seed);

}



static const struct rhashtable_params netlink_rhashtable_params = {

	.head_offset = offsetof(struct netlink_sock, node),

	.key_len = netlink_compare_arg_len,

	.hashfn = jhash,

	.obj_hashfn = netlink_hash,

	.obj_cmpfn = netlink_compare,

	.max_size = 65536,