diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2015-03-24 00:50:22 +1100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-23 22:07:51 -0400 |
| commit | 11b58ba146ccd7b105c4962c75f2e744053c85bc (patch) | |
| tree | 6bc96086b4737dda68fd8349443abab7efba8066 /net/netlink | |
| parent | rhashtable: Allow hashfn to be unset (diff) | |
| download | linux-dev-11b58ba146ccd7b105c4962c75f2e744053c85bc.tar.xz linux-dev-11b58ba146ccd7b105c4962c75f2e744053c85bc.zip | |
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: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 651792141f07..e2f7f28148e0 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -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, |