rhashtable: Disable automatic shrinking by default

[deliverable/linux.git] / net / netlink / af_netlink.c

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 651792141f076d9ff2100f9adc3bea2d054ff0e0..4caa809dbbe0332ca32b7b0279e61289b01574e3 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -3133,16 +3133,16 @@ 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,
+       .automatic_shrinking = true,
 };
 
 static int __init netlink_proto_init(void)