From patchwork Wed Mar 18 09:01:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 451264 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 262C71400D5 for ; Wed, 18 Mar 2015 20:01:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755504AbbCRJB2 (ORCPT ); Wed, 18 Mar 2015 05:01:28 -0400 Received: from ringil.hengli.com.au ([178.18.16.133]:60059 "EHLO ringil.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755013AbbCRJBY (ORCPT ); Wed, 18 Mar 2015 05:01:24 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by norbury.hengli.com.au with esmtp (Exim 4.80 #3 (Debian)) id 1YY9qp-0006wG-06; Wed, 18 Mar 2015 20:01:19 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.80) (envelope-from ) id 1YY9qo-0005mi-Qf; Wed, 18 Mar 2015 20:01:18 +1100 Subject: [v2 PATCH 4/6] tipc: Use rhashtable max/min_size instead of max/min_shift References: <20150315104306.GA21999@gondor.apana.org.au> To: David Miller , tgraf@suug.ch, netdev@vger.kernel.org, Eric Dumazet Message-Id: From: Herbert Xu Date: Wed, 18 Mar 2015 20:01:18 +1100 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch converts tipc to use rhashtable max/min_size instead of the obsolete max/min_shift. Signed-off-by: Herbert Xu --- net/tipc/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 813847d..d7a6c10 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);