From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Hunt Subject: [PATCH v4 2/2] rhashtable: require max_shift if grow_decision defined Date: Tue, 24 Feb 2015 13:07:07 -0500 Message-ID: <1424801227-17320-3-git-send-email-johunt@akamai.com> References: <1424801227-17320-1-git-send-email-johunt@akamai.com> Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Daniel Borkmann , Josh Hunt To: Pablo Neira Ayuso , Patrick McHardy , Thomas Graf Return-path: Received: from prod-mail-xrelay08.akamai.com ([96.6.114.112]:18542 "EHLO prod-mail-xrelay08.akamai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753124AbbBXSHK (ORCPT ); Tue, 24 Feb 2015 13:07:10 -0500 In-Reply-To: <1424801227-17320-1-git-send-email-johunt@akamai.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: If an rhashtable user defines a grow_decision fn they must also define a max_shift parameter. Acked-by: Thomas Graf Signed-off-by: Josh Hunt --- lib/rhashtable.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 9cc4c4a..7d6f539 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -1077,7 +1077,8 @@ int rhashtable_init(struct rhashtable *ht, struct rhashtable_params *params) size = HASH_DEFAULT_SIZE; if ((params->key_len && !params->hashfn) || - (!params->key_len && !params->obj_hashfn)) + (!params->key_len && !params->obj_hashfn) || + (params->grow_decision && !params->max_shift)) return -EINVAL; if (params->nulls_base && params->nulls_base < (1U << RHT_BASE_SHIFT)) -- 1.7.9.5