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>

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);