From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kukkonen Subject: [PATCH] NETFILTER: Fix handling of module param dcc_timeout in ip_conntrack_irc.c Date: Wed, 21 Dec 2005 23:06:21 +0200 Message-ID: <20051221210621.GD24213@localhost.localdomain> Reply-To: mikukkon@iki.fi Mime-Version: 1.0 Return-path: Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-Id: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: coreteam@netfilter.org, netfilter@lists.netfilter.org Cc: linux-kernel@vger.kernel.org Variable dcc_timeout is unsigned, so change the module_param() to reflect that, and also remove the now unneeded check in init(). Signed-of-by: Mika Kukkonen --- diff --git a/net/ipv4/netfilter/ip_conntrack_irc.c b/net/ipv4/netfilter/ip_conntrack_irc.c index d7c4042..90bd850 100644 --- a/net/ipv4/netfilter/ip_conntrack_irc.c +++ b/net/ipv4/netfilter/ip_conntrack_irc.c @@ -56,7 +56,7 @@ module_param_array(ports, ushort, &ports MODULE_PARM_DESC(ports, "port numbers of IRC servers"); module_param(max_dcc_channels, int, 0400); MODULE_PARM_DESC(max_dcc_channels, "max number of expected DCC channels per IRC session"); -module_param(dcc_timeout, int, 0400); +module_param(dcc_timeout, uint, 0400); MODULE_PARM_DESC(dcc_timeout, "timeout on for unestablished DCC channels"); static const char *dccprotos[] = { "SEND ", "CHAT ", "MOVE ", "TSEND ", "SCHAT " }; @@ -254,10 +254,6 @@ static int __init init(void) printk("ip_conntrack_irc: max_dcc_channels must be a positive integer\n"); return -EBUSY; } - if (dcc_timeout < 0) { - printk("ip_conntrack_irc: dcc_timeout must be a positive integer\n"); - return -EBUSY; - } irc_buffer = kmalloc(65536, GFP_KERNEL); if (!irc_buffer)