From patchwork Thu Feb 19 23:43:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hagen Paul Pfeifer X-Patchwork-Id: 23460 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 97715DDDFF for ; Fri, 20 Feb 2009 11:01:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755748AbZBTAB2 (ORCPT ); Thu, 19 Feb 2009 19:01:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755620AbZBTAB0 (ORCPT ); Thu, 19 Feb 2009 19:01:26 -0500 Received: from alternativer.internetendpunkt.de ([88.198.24.89]:39702 "EHLO geheimer.internetendpunkt.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755536AbZBTABY (ORCPT ); Thu, 19 Feb 2009 19:01:24 -0500 Received: by geheimer.internetendpunkt.de (Postfix, from userid 1000) id 0DBBFF4429E; Fri, 20 Feb 2009 00:49:39 +0100 (CET) From: Hagen Paul Pfeifer To: netdev@vger.kernel.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH 1/2] nf_conntrack: table max size should hold at least table size Date: Fri, 20 Feb 2009 00:43:41 +0100 Message-Id: <1235087023-30451-2-git-send-email-hagen@jauu.net> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1235087023-30451-1-git-send-email-hagen@jauu.net> References: <1235087023-30451-1-git-send-email-hagen@jauu.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Table size is defined as unsigned, wheres the table maximum size is defined as a signed integer. The calculation of max is 8 or 4, multiplied the table size. Therefore the max value is aligned to unsigned. Signed-off-by: Hagen Paul Pfeifer --- include/net/netfilter/nf_conntrack.h | 2 +- net/netfilter/nf_conntrack_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 2e0c536..4dfb793 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -287,7 +287,7 @@ static inline int nf_ct_is_untracked(const struct sk_buff *skb) extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp); extern unsigned int nf_conntrack_htable_size; -extern int nf_conntrack_max; +extern unsigned int nf_conntrack_max; #define NF_CT_STAT_INC(net, count) \ (per_cpu_ptr((net)->ct.stat, raw_smp_processor_id())->count++) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 90ce9dd..f3aa4e6 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_lock); unsigned int nf_conntrack_htable_size __read_mostly; EXPORT_SYMBOL_GPL(nf_conntrack_htable_size); -int nf_conntrack_max __read_mostly; +unsigned int nf_conntrack_max __read_mostly; EXPORT_SYMBOL_GPL(nf_conntrack_max); struct nf_conn nf_conntrack_untracked __read_mostly;