diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-31 03:08:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-31 03:08:13 -0400 |
| commit | c5e77f5216abdd1d98e6d14d9a3eb4e88d80011a (patch) | |
| tree | a542b5bb7d96a8f37c4d5e3319086064448ed67b /net/netlink | |
| parent | de81e64b250d3865a75d221a80b4311e3273670a (diff) | |
| parent | e42391cd048809d903291d07f86ed3934ce138e9 (diff) | |
Merge tag 'v4.0-rc6' into timers/core, before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2702673f0f23..05919bf3f670 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -3126,8 +3126,6 @@ static int __init netlink_proto_init(void) | |||
| 3126 | .key_len = sizeof(u32), /* portid */ | 3126 | .key_len = sizeof(u32), /* portid */ |
| 3127 | .hashfn = jhash, | 3127 | .hashfn = jhash, |
| 3128 | .max_shift = 16, /* 64K */ | 3128 | .max_shift = 16, /* 64K */ |
| 3129 | .grow_decision = rht_grow_above_75, | ||
| 3130 | .shrink_decision = rht_shrink_below_30, | ||
| 3131 | }; | 3129 | }; |
| 3132 | 3130 | ||
| 3133 | if (err != 0) | 3131 | if (err != 0) |