aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-03-24 17:53:06 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-24 17:53:06 -0400
commit9ead3527f5967440f2ff57fd2fa25dd0e460fc5a (patch)
tree8464850fd94dba0dfa34c75c46dfb3fcf4c3c381 /net/tipc
parent27cd5452476978283decb19e429e81fc6c71e74b (diff)
parent6b6f302ceda7a052dab545d6c69abf5f0d4a6cab (diff)
Merge branch 'rhashtable-next'
Thomas Graf says: ==================== rhashtable updates on top of Herbert's work Patch 1 is a bugfix for an RCU splash I encountered while testing. Patch 2 & 3 are pure cleanups. Patch 4 disables automatic shrinking by default as discussed in previous thread. Patch 5 removes some rhashtable internal knowledge from nft_hash and fixes another RCU splash. I've pushed various rhashtable tests (Netlink, nft) together with a Makefile to a git tree [0] for easier stress testing. [0] https://github.com/tgraf/rhashtable ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 094710519477..ee90d74d7516 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -2297,6 +2297,7 @@ static const struct rhashtable_params tsk_rht_params = {
2297 .key_len = sizeof(u32), /* portid */ 2297 .key_len = sizeof(u32), /* portid */
2298 .max_size = 1048576, 2298 .max_size = 1048576,
2299 .min_size = 256, 2299 .min_size = 256,
2300 .automatic_shrinking = true,
2300}; 2301};
2301 2302
2302int tipc_sk_rht_init(struct net *net) 2303int tipc_sk_rht_init(struct net *net)