diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 09:46:03 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 09:46:03 +0100 |
commit | 072e5a1cfabca7276744d24726e094d85721df5c (patch) | |
tree | c7237fa143f72273aa8a8179f741c24b9072001c /net/tipc/socket.c | |
parent | 294fe0f52a44c6f207211de0686c369a961b5533 (diff) | |
parent | d525211f9d1be8b523ec7633f080f2116f5ea536 (diff) |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tipc/socket.c')
-rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index f73e975af80b..b4d4467d0bb0 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2364,8 +2364,6 @@ int tipc_sk_rht_init(struct net *net) .hashfn = jhash, .max_shift = 20, /* 1M */ .min_shift = 8, /* 256 */ - .grow_decision = rht_grow_above_75, - .shrink_decision = rht_shrink_below_30, }; return rhashtable_init(&tn->sk_rht, &rht_params); |