diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-03-18 12:46:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-18 12:47:50 -0400 |
| commit | b65885d29d41c7245bbd98769e781f77e8d9ed5b (patch) | |
| tree | 9509ed7547a4788e818c3038f7ce38a8856cf1ef /net/tipc | |
| parent | Merge branch 'xgene-next' (diff) | |
| parent | rhashtable: Remove max_shift and min_shift (diff) | |
| download | linux-dev-b65885d29d41c7245bbd98769e781f77e8d9ed5b.tar.xz linux-dev-b65885d29d41c7245bbd98769e781f77e8d9ed5b.zip | |
Merge branch 'rhashtable_remove_shift'
Herbert Xu says:
====================
rhashtable: Kill redundant shift parameter
I was trying to squeeze bucket_table->rehash in by downsizing
bucket_table->size, only to find that my spot had been taken
over by bucket_table->shift. These patches kill shift and makes
me feel better :)
v2 corrects the typo in the test_rhashtable changelog and also
notes the min_shift parameter in the tipc patch changelog.
====================
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 813847d25a49..d7a6c10202e9 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2286,8 +2286,8 @@ int tipc_sk_rht_init(struct net *net) .key_offset = offsetof(struct tipc_sock, portid), .key_len = sizeof(u32), /* portid */ .hashfn = jhash, - .max_shift = 20, /* 1M */ - .min_shift = 8, /* 256 */ + .max_size = 1048576, + .min_size = 256, }; return rhashtable_init(&tn->sk_rht, &rht_params); |