[NETFILTER]: Fix timeout sysctls on big-endian 64bit architectures

The connection tracking timeout variables are unsigned long, but proc_dointvec_jiffies is used with sizeof(unsigned int) in the sysctl tables. Since there is no proc_doulongvec_jiffies function, change the timeout variables to unsigned int. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
author: Patrick McHardy <kaber@trash.net> 2006-01-09 20:48:09 -0500
committer: David S. Miller <davem@sunset.davemloft.net> 2006-01-10 15:54:35 -0500
commit: babbdb1a18d37e57acae7e348ef122f2b905df0a (patch)
tree: 51bb7dbffe28ae6f342e0bcc155a54264f30b5e5
parent: 9d28026b7ec0f3e2a407d5c03fcb37d0b59d1add (diff)
13 files changed, 73 insertions, 73 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_generic.c b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
index 88c3712bd251..f891308b5e4c 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_generic.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
@@ -12,7 +12,7 @@
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
-unsigned long ip_ct_generic_timeout = 600*HZ;
+unsigned int ip_ct_generic_timeout = 600*HZ;
 static int generic_pkt_to_tuple(const struct sk_buff *skb,
                                unsigned int dataoff,
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
index 30fc21d6165a..f2a90e2743d7 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
@@ -22,7 +22,7 @@
 #include <linux/netfilter_ipv4/ip_conntrack_core.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
-unsigned long ip_ct_icmp_timeout = 30*HZ;
+unsigned int ip_ct_icmp_timeout = 30*HZ;
 #if 0
 #define DEBUGP printk
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
index 0b25050981a1..be602e8aeab0 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
@@ -58,15 +58,15 @@ static const char *sctp_conntrack_names[] = {
 #define HOURS * 60 MINS
 #define DAYS  * 24 HOURS
-static unsigned long ip_ct_sctp_timeout_closed            =  10 SECS;
+static unsigned int ip_ct_sctp_timeout_closed            =  10 SECS;
-static unsigned long ip_ct_sctp_timeout_cookie_wait       =   3 SECS;
+static unsigned int ip_ct_sctp_timeout_cookie_wait       =   3 SECS;
-static unsigned long ip_ct_sctp_timeout_cookie_echoed     =   3 SECS;
+static unsigned int ip_ct_sctp_timeout_cookie_echoed     =   3 SECS;
-static unsigned long ip_ct_sctp_timeout_established       =   5 DAYS;
+static unsigned int ip_ct_sctp_timeout_established       =   5 DAYS;
-static unsigned long ip_ct_sctp_timeout_shutdown_sent     = 300 SECS / 1000;
+static unsigned int ip_ct_sctp_timeout_shutdown_sent     = 300 SECS / 1000;
-static unsigned long ip_ct_sctp_timeout_shutdown_recd     = 300 SECS / 1000;
+static unsigned int ip_ct_sctp_timeout_shutdown_recd     = 300 SECS / 1000;
-static unsigned long ip_ct_sctp_timeout_shutdown_ack_sent =   3 SECS;
+static unsigned int ip_ct_sctp_timeout_shutdown_ack_sent =   3 SECS;
-static const unsigned long * sctp_timeouts[]
+static const unsigned int * sctp_timeouts[]
 = { NULL,                                  /* SCTP_CONNTRACK_NONE  */
    &ip_ct_sctp_timeout_closed,            /* SCTP_CONNTRACK_CLOSED */
    &ip_ct_sctp_timeout_cookie_wait,       /* SCTP_CONNTRACK_COOKIE_WAIT */
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index 77f304680d86..ea2b39c18050 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -85,21 +85,21 @@ static const char *tcp_conntrack_names[] = {
 #define HOURS * 60 MINS
 #define DAYS * 24 HOURS
-unsigned long ip_ct_tcp_timeout_syn_sent =      2 MINS;
+unsigned int ip_ct_tcp_timeout_syn_sent =      2 MINS;
-unsigned long ip_ct_tcp_timeout_syn_recv =     60 SECS;
+unsigned int ip_ct_tcp_timeout_syn_recv =     60 SECS;
-unsigned long ip_ct_tcp_timeout_established =   5 DAYS;
+unsigned int ip_ct_tcp_timeout_established =   5 DAYS;
-unsigned long ip_ct_tcp_timeout_fin_wait =      2 MINS;
+unsigned int ip_ct_tcp_timeout_fin_wait =      2 MINS;
-unsigned long ip_ct_tcp_timeout_close_wait =   60 SECS;
+unsigned int ip_ct_tcp_timeout_close_wait =   60 SECS;
-unsigned long ip_ct_tcp_timeout_last_ack =     30 SECS;
+unsigned int ip_ct_tcp_timeout_last_ack =     30 SECS;
-unsigned long ip_ct_tcp_timeout_time_wait =     2 MINS;
+unsigned int ip_ct_tcp_timeout_time_wait =     2 MINS;
-unsigned long ip_ct_tcp_timeout_close =        10 SECS;
+unsigned int ip_ct_tcp_timeout_close =        10 SECS;
 /* RFC1122 says the R2 limit should be at least 100 seconds.
   Linux uses 15 packets as limit, which corresponds 
   to ~13-30min depending on RTO. */
-unsigned long ip_ct_tcp_timeout_max_retrans =     5 MINS;
+unsigned int ip_ct_tcp_timeout_max_retrans =     5 MINS;
 
-static const unsigned long * tcp_timeouts[]
+static const unsigned int * tcp_timeouts[]
 = { NULL,                              /*      TCP_CONNTRACK_NONE */
    &ip_ct_tcp_timeout_syn_sent,       /*      TCP_CONNTRACK_SYN_SENT, */
    &ip_ct_tcp_timeout_syn_recv,       /*      TCP_CONNTRACK_SYN_RECV, */
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_udp.c b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
index 46becbe4fe58..004003fd6117 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
@@ -19,8 +19,8 @@
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
-unsigned long ip_ct_udp_timeout = 30*HZ;
+unsigned int ip_ct_udp_timeout = 30*HZ;
-unsigned long ip_ct_udp_timeout_stream = 180*HZ;
+unsigned int ip_ct_udp_timeout_stream = 180*HZ;
 static int udp_pkt_to_tuple(const struct sk_buff *skb,
                             unsigned int dataoff,
diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 7ba97783e741..9dec1293f67a 100644
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -544,28 +544,28 @@ extern int ip_conntrack_max;
 extern unsigned int ip_conntrack_htable_size;
 /* From ip_conntrack_proto_tcp.c */
-extern unsigned long ip_ct_tcp_timeout_syn_sent;
+extern unsigned int ip_ct_tcp_timeout_syn_sent;
-extern unsigned long ip_ct_tcp_timeout_syn_recv;
+extern unsigned int ip_ct_tcp_timeout_syn_recv;
-extern unsigned long ip_ct_tcp_timeout_established;
+extern unsigned int ip_ct_tcp_timeout_established;
-extern unsigned long ip_ct_tcp_timeout_fin_wait;
+extern unsigned int ip_ct_tcp_timeout_fin_wait;
-extern unsigned long ip_ct_tcp_timeout_close_wait;
+extern unsigned int ip_ct_tcp_timeout_close_wait;
-extern unsigned long ip_ct_tcp_timeout_last_ack;
+extern unsigned int ip_ct_tcp_timeout_last_ack;
-extern unsigned long ip_ct_tcp_timeout_time_wait;
+extern unsigned int ip_ct_tcp_timeout_time_wait;
-extern unsigned long ip_ct_tcp_timeout_close;
+extern unsigned int ip_ct_tcp_timeout_close;
-extern unsigned long ip_ct_tcp_timeout_max_retrans;
+extern unsigned int ip_ct_tcp_timeout_max_retrans;
 extern int ip_ct_tcp_loose;
 extern int ip_ct_tcp_be_liberal;
 extern int ip_ct_tcp_max_retrans;
 /* From ip_conntrack_proto_udp.c */
-extern unsigned long ip_ct_udp_timeout;
+extern unsigned int ip_ct_udp_timeout;
-extern unsigned long ip_ct_udp_timeout_stream;
+extern unsigned int ip_ct_udp_timeout_stream;
 /* From ip_conntrack_proto_icmp.c */
-extern unsigned long ip_ct_icmp_timeout;
+extern unsigned int ip_ct_icmp_timeout;
 /* From ip_conntrack_proto_icmp.c */
-extern unsigned long ip_ct_generic_timeout;
+extern unsigned int ip_ct_generic_timeout;
 /* Log invalid packets of a given protocol */
 static int log_invalid_proto_min = 0;
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 9bdbb7793971..0c56c52a3831 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -277,7 +277,7 @@ static struct nf_hook_ops ipv4_conntrack_local_in_ops = {
 #ifdef CONFIG_SYSCTL
 /* From nf_conntrack_proto_icmp.c */
-extern unsigned long nf_ct_icmp_timeout;
+extern unsigned int nf_ct_icmp_timeout;
 static struct ctl_table_header *nf_ct_ipv4_sysctl_header;
 static ctl_table nf_ct_sysctl_table[] = {
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 704fbbe74874..e57d6fc9957a 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -335,10 +335,10 @@ static struct nf_hook_ops ipv6_conntrack_local_in_ops = {
 #ifdef CONFIG_SYSCTL
 /* From nf_conntrack_proto_icmpv6.c */
-extern unsigned long nf_ct_icmpv6_timeout;
+extern unsigned int nf_ct_icmpv6_timeout;
 /* From nf_conntrack_frag6.c */
-extern unsigned long nf_ct_frag6_timeout;
+extern unsigned int nf_ct_frag6_timeout;
 extern unsigned int nf_ct_frag6_low_thresh;
 extern unsigned int nf_ct_frag6_high_thresh;
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
index 36425f6c833f..46bc27e2756d 100644
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -17,7 +17,7 @@
 #include <linux/netfilter.h>
 #include <net/netfilter/nf_conntrack_protocol.h>
-unsigned long nf_ct_generic_timeout = 600*HZ;
+unsigned int nf_ct_generic_timeout = 600*HZ;
 static int generic_pkt_to_tuple(const struct sk_buff *skb,
                                unsigned int dataoff,
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 3a600f77b4e0..cf798e61e379 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -62,15 +62,15 @@ static const char *sctp_conntrack_names[] = {
 #define HOURS * 60 MINS
 #define DAYS  * 24 HOURS
-static unsigned long nf_ct_sctp_timeout_closed            =  10 SECS;
+static unsigned int nf_ct_sctp_timeout_closed            =  10 SECS;
-static unsigned long nf_ct_sctp_timeout_cookie_wait       =   3 SECS;
+static unsigned int nf_ct_sctp_timeout_cookie_wait       =   3 SECS;
-static unsigned long nf_ct_sctp_timeout_cookie_echoed     =   3 SECS;
+static unsigned int nf_ct_sctp_timeout_cookie_echoed     =   3 SECS;
-static unsigned long nf_ct_sctp_timeout_established       =   5 DAYS;
+static unsigned int nf_ct_sctp_timeout_established       =   5 DAYS;
-static unsigned long nf_ct_sctp_timeout_shutdown_sent     = 300 SECS / 1000;
+static unsigned int nf_ct_sctp_timeout_shutdown_sent     = 300 SECS / 1000;
-static unsigned long nf_ct_sctp_timeout_shutdown_recd     = 300 SECS / 1000;
+static unsigned int nf_ct_sctp_timeout_shutdown_recd     = 300 SECS / 1000;
-static unsigned long nf_ct_sctp_timeout_shutdown_ack_sent =   3 SECS;
+static unsigned int nf_ct_sctp_timeout_shutdown_ack_sent =   3 SECS;
-static unsigned long * sctp_timeouts[]
+static unsigned int * sctp_timeouts[]
 = { NULL,                                  /* SCTP_CONNTRACK_NONE  */
    &nf_ct_sctp_timeout_closed,            /* SCTP_CONNTRACK_CLOSED */
    &nf_ct_sctp_timeout_cookie_wait,       /* SCTP_CONNTRACK_COOKIE_WAIT */
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 9a1348a51a0d..df99138c3b3b 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -93,21 +93,21 @@ static const char *tcp_conntrack_names[] = {
 #define HOURS * 60 MINS
 #define DAYS * 24 HOURS
-unsigned long nf_ct_tcp_timeout_syn_sent =      2 MINS;
+unsigned int nf_ct_tcp_timeout_syn_sent =      2 MINS;
-unsigned long nf_ct_tcp_timeout_syn_recv =     60 SECS;
+unsigned int nf_ct_tcp_timeout_syn_recv =     60 SECS;
-unsigned long nf_ct_tcp_timeout_established =   5 DAYS;
+unsigned int nf_ct_tcp_timeout_established =   5 DAYS;
-unsigned long nf_ct_tcp_timeout_fin_wait =      2 MINS;
+unsigned int nf_ct_tcp_timeout_fin_wait =      2 MINS;
-unsigned long nf_ct_tcp_timeout_close_wait =   60 SECS;
+unsigned int nf_ct_tcp_timeout_close_wait =   60 SECS;
-unsigned long nf_ct_tcp_timeout_last_ack =     30 SECS;
+unsigned int nf_ct_tcp_timeout_last_ack =     30 SECS;
-unsigned long nf_ct_tcp_timeout_time_wait =     2 MINS;
+unsigned int nf_ct_tcp_timeout_time_wait =     2 MINS;
-unsigned long nf_ct_tcp_timeout_close =        10 SECS;
+unsigned int nf_ct_tcp_timeout_close =        10 SECS;
 /* RFC1122 says the R2 limit should be at least 100 seconds.
   Linux uses 15 packets as limit, which corresponds 
   to ~13-30min depending on RTO. */
-unsigned long nf_ct_tcp_timeout_max_retrans =     5 MINS;
+unsigned int nf_ct_tcp_timeout_max_retrans =     5 MINS;
 
-static unsigned long * tcp_timeouts[]
+static unsigned int * tcp_timeouts[]
 = { NULL,                              /* TCP_CONNTRACK_NONE */
    &nf_ct_tcp_timeout_syn_sent,       /* TCP_CONNTRACK_SYN_SENT, */
    &nf_ct_tcp_timeout_syn_recv,       /* TCP_CONNTRACK_SYN_RECV, */
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index 1a592a556182..4264dd079a16 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -27,8 +27,8 @@
 #include <linux/netfilter_ipv6.h>
 #include <net/netfilter/nf_conntrack_protocol.h>
-unsigned long nf_ct_udp_timeout = 30*HZ;
+unsigned int nf_ct_udp_timeout = 30*HZ;
-unsigned long nf_ct_udp_timeout_stream = 180*HZ;
+unsigned int nf_ct_udp_timeout_stream = 180*HZ;
 static int udp_pkt_to_tuple(const struct sk_buff *skb,
                             unsigned int dataoff,
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index d17e42b28c79..3531d142f693 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -431,25 +431,25 @@ extern int nf_conntrack_max;
 extern unsigned int nf_conntrack_htable_size;
 /* From nf_conntrack_proto_tcp.c */
-extern unsigned long nf_ct_tcp_timeout_syn_sent;
+extern unsigned int nf_ct_tcp_timeout_syn_sent;
-extern unsigned long nf_ct_tcp_timeout_syn_recv;
+extern unsigned int nf_ct_tcp_timeout_syn_recv;
-extern unsigned long nf_ct_tcp_timeout_established;
+extern unsigned int nf_ct_tcp_timeout_established;
-extern unsigned long nf_ct_tcp_timeout_fin_wait;
+extern unsigned int nf_ct_tcp_timeout_fin_wait;
-extern unsigned long nf_ct_tcp_timeout_close_wait;
+extern unsigned int nf_ct_tcp_timeout_close_wait;
-extern unsigned long nf_ct_tcp_timeout_last_ack;
+extern unsigned int nf_ct_tcp_timeout_last_ack;
-extern unsigned long nf_ct_tcp_timeout_time_wait;
+extern unsigned int nf_ct_tcp_timeout_time_wait;
-extern unsigned long nf_ct_tcp_timeout_close;
+extern unsigned int nf_ct_tcp_timeout_close;
-extern unsigned long nf_ct_tcp_timeout_max_retrans;
+extern unsigned int nf_ct_tcp_timeout_max_retrans;
 extern int nf_ct_tcp_loose;
 extern int nf_ct_tcp_be_liberal;
 extern int nf_ct_tcp_max_retrans;
 /* From nf_conntrack_proto_udp.c */
-extern unsigned long nf_ct_udp_timeout;
+extern unsigned int nf_ct_udp_timeout;
-extern unsigned long nf_ct_udp_timeout_stream;
+extern unsigned int nf_ct_udp_timeout_stream;
 /* From nf_conntrack_proto_generic.c */
-extern unsigned long nf_ct_generic_timeout;
+extern unsigned int nf_ct_generic_timeout;
 /* Log invalid packets of a given protocol */
 static int log_invalid_proto_min = 0;
author	Patrick McHardy <kaber@trash.net>	2006-01-09 20:48:09 -0500
committer	David S. Miller <davem@sunset.davemloft.net>	2006-01-10 15:54:35 -0500
commit	babbdb1a18d37e57acae7e348ef122f2b905df0a (patch)
tree	51bb7dbffe28ae6f342e0bcc155a54264f30b5e5
parent	9d28026b7ec0f3e2a407d5c03fcb37d0b59d1add (diff)

diff --git a/net/ipv4/netfilter/ip_conntrack_proto_generic.c b/net/ipv4/netfilter/ip_conntrack_proto_generic.c index 88c3712bd251..f891308b5e4c 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_generic.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
@@ -12,7 +12,7 @@
12	#include <linux/netfilter.h>	12	#include <linux/netfilter.h>
13	#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>	13	#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
14		14
15	unsigned long ip_ct_generic_timeout = 600*HZ;	15	unsigned int ip_ct_generic_timeout = 600*HZ;
16		16
17	static int generic_pkt_to_tuple(const struct sk_buff *skb,	17	static int generic_pkt_to_tuple(const struct sk_buff *skb,
18	unsigned int dataoff,	18	unsigned int dataoff,


diff --git a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c index 30fc21d6165a..f2a90e2743d7 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
@@ -22,7 +22,7 @@
22	#include <linux/netfilter_ipv4/ip_conntrack_core.h>	22	#include <linux/netfilter_ipv4/ip_conntrack_core.h>
23	#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>	23	#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
24		24
25	unsigned long ip_ct_icmp_timeout = 30*HZ;	25	unsigned int ip_ct_icmp_timeout = 30*HZ;
26		26
27	#if 0	27	#if 0
28	#define DEBUGP printk	28	#define DEBUGP printk


diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c index 0b25050981a1..be602e8aeab0 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
@@ -58,15 +58,15 @@ static const char *sctp_conntrack_names[] = {
58	#define HOURS * 60 MINS	58	#define HOURS * 60 MINS
59	#define DAYS * 24 HOURS	59	#define DAYS * 24 HOURS
60		60
61	static unsigned long ip_ct_sctp_timeout_closed = 10 SECS;	61	static unsigned int ip_ct_sctp_timeout_closed = 10 SECS;
62	static unsigned long ip_ct_sctp_timeout_cookie_wait = 3 SECS;	62	static unsigned int ip_ct_sctp_timeout_cookie_wait = 3 SECS;
63	static unsigned long ip_ct_sctp_timeout_cookie_echoed = 3 SECS;	63	static unsigned int ip_ct_sctp_timeout_cookie_echoed = 3 SECS;
64	static unsigned long ip_ct_sctp_timeout_established = 5 DAYS;	64	static unsigned int ip_ct_sctp_timeout_established = 5 DAYS;
65	static unsigned long ip_ct_sctp_timeout_shutdown_sent = 300 SECS / 1000;	65	static unsigned int ip_ct_sctp_timeout_shutdown_sent = 300 SECS / 1000;
66	static unsigned long ip_ct_sctp_timeout_shutdown_recd = 300 SECS / 1000;	66	static unsigned int ip_ct_sctp_timeout_shutdown_recd = 300 SECS / 1000;
67	static unsigned long ip_ct_sctp_timeout_shutdown_ack_sent = 3 SECS;	67	static unsigned int ip_ct_sctp_timeout_shutdown_ack_sent = 3 SECS;
68		68
69	static const unsigned long * sctp_timeouts[]	69	static const unsigned int * sctp_timeouts[]
70	= { NULL, /* SCTP_CONNTRACK_NONE */	70	= { NULL, /* SCTP_CONNTRACK_NONE */
71	&ip_ct_sctp_timeout_closed, /* SCTP_CONNTRACK_CLOSED */	71	&ip_ct_sctp_timeout_closed, /* SCTP_CONNTRACK_CLOSED */
72	&ip_ct_sctp_timeout_cookie_wait, /* SCTP_CONNTRACK_COOKIE_WAIT */	72	&ip_ct_sctp_timeout_cookie_wait, /* SCTP_CONNTRACK_COOKIE_WAIT */


diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index 77f304680d86..ea2b39c18050 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -85,21 +85,21 @@ static const char *tcp_conntrack_names[] = {
85	#define HOURS * 60 MINS	85	#define HOURS * 60 MINS
86	#define DAYS * 24 HOURS	86	#define DAYS * 24 HOURS
87		87
88	unsigned long ip_ct_tcp_timeout_syn_sent = 2 MINS;	88	unsigned int ip_ct_tcp_timeout_syn_sent = 2 MINS;
89	unsigned long ip_ct_tcp_timeout_syn_recv = 60 SECS;	89	unsigned int ip_ct_tcp_timeout_syn_recv = 60 SECS;
90	unsigned long ip_ct_tcp_timeout_established = 5 DAYS;	90	unsigned int ip_ct_tcp_timeout_established = 5 DAYS;
91	unsigned long ip_ct_tcp_timeout_fin_wait = 2 MINS;	91	unsigned int ip_ct_tcp_timeout_fin_wait = 2 MINS;
92	unsigned long ip_ct_tcp_timeout_close_wait = 60 SECS;	92	unsigned int ip_ct_tcp_timeout_close_wait = 60 SECS;
93	unsigned long ip_ct_tcp_timeout_last_ack = 30 SECS;	93	unsigned int ip_ct_tcp_timeout_last_ack = 30 SECS;
94	unsigned long ip_ct_tcp_timeout_time_wait = 2 MINS;	94	unsigned int ip_ct_tcp_timeout_time_wait = 2 MINS;
95	unsigned long ip_ct_tcp_timeout_close = 10 SECS;	95	unsigned int ip_ct_tcp_timeout_close = 10 SECS;
96		96
97	/* RFC1122 says the R2 limit should be at least 100 seconds.	97	/* RFC1122 says the R2 limit should be at least 100 seconds.
98	Linux uses 15 packets as limit, which corresponds	98	Linux uses 15 packets as limit, which corresponds
99	to ~13-30min depending on RTO. */	99	to ~13-30min depending on RTO. */
100	unsigned long ip_ct_tcp_timeout_max_retrans = 5 MINS;	100	unsigned int ip_ct_tcp_timeout_max_retrans = 5 MINS;
101		101
102	static const unsigned long * tcp_timeouts[]	102	static const unsigned int * tcp_timeouts[]
103	= { NULL, /* TCP_CONNTRACK_NONE */	103	= { NULL, /* TCP_CONNTRACK_NONE */
104	&ip_ct_tcp_timeout_syn_sent, /* TCP_CONNTRACK_SYN_SENT, */	104	&ip_ct_tcp_timeout_syn_sent, /* TCP_CONNTRACK_SYN_SENT, */
105	&ip_ct_tcp_timeout_syn_recv, /* TCP_CONNTRACK_SYN_RECV, */	105	&ip_ct_tcp_timeout_syn_recv, /* TCP_CONNTRACK_SYN_RECV, */


diff --git a/net/ipv4/netfilter/ip_conntrack_proto_udp.c b/net/ipv4/netfilter/ip_conntrack_proto_udp.c index 46becbe4fe58..004003fd6117 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_udp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_udp.c
@@ -19,8 +19,8 @@
19	#include <linux/netfilter_ipv4.h>	19	#include <linux/netfilter_ipv4.h>
20	#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>	20	#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
21		21
22	unsigned long ip_ct_udp_timeout = 30*HZ;	22	unsigned int ip_ct_udp_timeout = 30*HZ;
23	unsigned long ip_ct_udp_timeout_stream = 180*HZ;	23	unsigned int ip_ct_udp_timeout_stream = 180*HZ;
24		24
25	static int udp_pkt_to_tuple(const struct sk_buff *skb,	25	static int udp_pkt_to_tuple(const struct sk_buff *skb,
26	unsigned int dataoff,	26	unsigned int dataoff,


diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index 7ba97783e741..9dec1293f67a 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -544,28 +544,28 @@ extern int ip_conntrack_max;
544	extern unsigned int ip_conntrack_htable_size;	544	extern unsigned int ip_conntrack_htable_size;
545		545
546	/* From ip_conntrack_proto_tcp.c */	546	/* From ip_conntrack_proto_tcp.c */
547	extern unsigned long ip_ct_tcp_timeout_syn_sent;	547	extern unsigned int ip_ct_tcp_timeout_syn_sent;
548	extern unsigned long ip_ct_tcp_timeout_syn_recv;	548	extern unsigned int ip_ct_tcp_timeout_syn_recv;
549	extern unsigned long ip_ct_tcp_timeout_established;	549	extern unsigned int ip_ct_tcp_timeout_established;
550	extern unsigned long ip_ct_tcp_timeout_fin_wait;	550	extern unsigned int ip_ct_tcp_timeout_fin_wait;
551	extern unsigned long ip_ct_tcp_timeout_close_wait;	551	extern unsigned int ip_ct_tcp_timeout_close_wait;
552	extern unsigned long ip_ct_tcp_timeout_last_ack;	552	extern unsigned int ip_ct_tcp_timeout_last_ack;
553	extern unsigned long ip_ct_tcp_timeout_time_wait;	553	extern unsigned int ip_ct_tcp_timeout_time_wait;
554	extern unsigned long ip_ct_tcp_timeout_close;	554	extern unsigned int ip_ct_tcp_timeout_close;
555	extern unsigned long ip_ct_tcp_timeout_max_retrans;	555	extern unsigned int ip_ct_tcp_timeout_max_retrans;
556	extern int ip_ct_tcp_loose;	556	extern int ip_ct_tcp_loose;
557	extern int ip_ct_tcp_be_liberal;	557	extern int ip_ct_tcp_be_liberal;
558	extern int ip_ct_tcp_max_retrans;	558	extern int ip_ct_tcp_max_retrans;
559		559
560	/* From ip_conntrack_proto_udp.c */	560	/* From ip_conntrack_proto_udp.c */
561	extern unsigned long ip_ct_udp_timeout;	561	extern unsigned int ip_ct_udp_timeout;
562	extern unsigned long ip_ct_udp_timeout_stream;	562	extern unsigned int ip_ct_udp_timeout_stream;
563		563
564	/* From ip_conntrack_proto_icmp.c */	564	/* From ip_conntrack_proto_icmp.c */
565	extern unsigned long ip_ct_icmp_timeout;	565	extern unsigned int ip_ct_icmp_timeout;
566		566
567	/* From ip_conntrack_proto_icmp.c */	567	/* From ip_conntrack_proto_icmp.c */
568	extern unsigned long ip_ct_generic_timeout;	568	extern unsigned int ip_ct_generic_timeout;
569		569
570	/* Log invalid packets of a given protocol */	570	/* Log invalid packets of a given protocol */
571	static int log_invalid_proto_min = 0;	571	static int log_invalid_proto_min = 0;


diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c index 9bdbb7793971..0c56c52a3831 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -277,7 +277,7 @@ static struct nf_hook_ops ipv4_conntrack_local_in_ops = {
277		277
278	#ifdef CONFIG_SYSCTL	278	#ifdef CONFIG_SYSCTL
279	/* From nf_conntrack_proto_icmp.c */	279	/* From nf_conntrack_proto_icmp.c */
280	extern unsigned long nf_ct_icmp_timeout;	280	extern unsigned int nf_ct_icmp_timeout;
281	static struct ctl_table_header *nf_ct_ipv4_sysctl_header;	281	static struct ctl_table_header *nf_ct_ipv4_sysctl_header;
282		282
283	static ctl_table nf_ct_sysctl_table[] = {	283	static ctl_table nf_ct_sysctl_table[] = {


diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 704fbbe74874..e57d6fc9957a 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -335,10 +335,10 @@ static struct nf_hook_ops ipv6_conntrack_local_in_ops = {
335	#ifdef CONFIG_SYSCTL	335	#ifdef CONFIG_SYSCTL
336		336
337	/* From nf_conntrack_proto_icmpv6.c */	337	/* From nf_conntrack_proto_icmpv6.c */
338	extern unsigned long nf_ct_icmpv6_timeout;	338	extern unsigned int nf_ct_icmpv6_timeout;
339		339
340	/* From nf_conntrack_frag6.c */	340	/* From nf_conntrack_frag6.c */
341	extern unsigned long nf_ct_frag6_timeout;	341	extern unsigned int nf_ct_frag6_timeout;
342	extern unsigned int nf_ct_frag6_low_thresh;	342	extern unsigned int nf_ct_frag6_low_thresh;
343	extern unsigned int nf_ct_frag6_high_thresh;	343	extern unsigned int nf_ct_frag6_high_thresh;
344		344


diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c index 36425f6c833f..46bc27e2756d 100644 --- a/net/netfilter/nf_conntrack_proto_generic.c +++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -17,7 +17,7 @@
17	#include <linux/netfilter.h>	17	#include <linux/netfilter.h>
18	#include <net/netfilter/nf_conntrack_protocol.h>	18	#include <net/netfilter/nf_conntrack_protocol.h>
19		19
20	unsigned long nf_ct_generic_timeout = 600*HZ;	20	unsigned int nf_ct_generic_timeout = 600*HZ;
21		21
22	static int generic_pkt_to_tuple(const struct sk_buff *skb,	22	static int generic_pkt_to_tuple(const struct sk_buff *skb,
23	unsigned int dataoff,	23	unsigned int dataoff,


diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c index 3a600f77b4e0..cf798e61e379 100644 --- a/net/netfilter/nf_conntrack_proto_sctp.c +++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -62,15 +62,15 @@ static const char *sctp_conntrack_names[] = {
62	#define HOURS * 60 MINS	62	#define HOURS * 60 MINS
63	#define DAYS * 24 HOURS	63	#define DAYS * 24 HOURS
64		64
65	static unsigned long nf_ct_sctp_timeout_closed = 10 SECS;	65	static unsigned int nf_ct_sctp_timeout_closed = 10 SECS;
66	static unsigned long nf_ct_sctp_timeout_cookie_wait = 3 SECS;	66	static unsigned int nf_ct_sctp_timeout_cookie_wait = 3 SECS;
67	static unsigned long nf_ct_sctp_timeout_cookie_echoed = 3 SECS;	67	static unsigned int nf_ct_sctp_timeout_cookie_echoed = 3 SECS;
68	static unsigned long nf_ct_sctp_timeout_established = 5 DAYS;	68	static unsigned int nf_ct_sctp_timeout_established = 5 DAYS;
69	static unsigned long nf_ct_sctp_timeout_shutdown_sent = 300 SECS / 1000;	69	static unsigned int nf_ct_sctp_timeout_shutdown_sent = 300 SECS / 1000;
70	static unsigned long nf_ct_sctp_timeout_shutdown_recd = 300 SECS / 1000;	70	static unsigned int nf_ct_sctp_timeout_shutdown_recd = 300 SECS / 1000;
71	static unsigned long nf_ct_sctp_timeout_shutdown_ack_sent = 3 SECS;	71	static unsigned int nf_ct_sctp_timeout_shutdown_ack_sent = 3 SECS;
72		72
73	static unsigned long * sctp_timeouts[]	73	static unsigned int * sctp_timeouts[]
74	= { NULL, /* SCTP_CONNTRACK_NONE */	74	= { NULL, /* SCTP_CONNTRACK_NONE */
75	&nf_ct_sctp_timeout_closed, /* SCTP_CONNTRACK_CLOSED */	75	&nf_ct_sctp_timeout_closed, /* SCTP_CONNTRACK_CLOSED */
76	&nf_ct_sctp_timeout_cookie_wait, /* SCTP_CONNTRACK_COOKIE_WAIT */	76	&nf_ct_sctp_timeout_cookie_wait, /* SCTP_CONNTRACK_COOKIE_WAIT */


diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 9a1348a51a0d..df99138c3b3b 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -93,21 +93,21 @@ static const char *tcp_conntrack_names[] = {
93	#define HOURS * 60 MINS	93	#define HOURS * 60 MINS
94	#define DAYS * 24 HOURS	94	#define DAYS * 24 HOURS
95		95
96	unsigned long nf_ct_tcp_timeout_syn_sent = 2 MINS;	96	unsigned int nf_ct_tcp_timeout_syn_sent = 2 MINS;
97	unsigned long nf_ct_tcp_timeout_syn_recv = 60 SECS;	97	unsigned int nf_ct_tcp_timeout_syn_recv = 60 SECS;
98	unsigned long nf_ct_tcp_timeout_established = 5 DAYS;	98	unsigned int nf_ct_tcp_timeout_established = 5 DAYS;
99	unsigned long nf_ct_tcp_timeout_fin_wait = 2 MINS;	99	unsigned int nf_ct_tcp_timeout_fin_wait = 2 MINS;
100	unsigned long nf_ct_tcp_timeout_close_wait = 60 SECS;	100	unsigned int nf_ct_tcp_timeout_close_wait = 60 SECS;
101	unsigned long nf_ct_tcp_timeout_last_ack = 30 SECS;	101	unsigned int nf_ct_tcp_timeout_last_ack = 30 SECS;
102	unsigned long nf_ct_tcp_timeout_time_wait = 2 MINS;	102	unsigned int nf_ct_tcp_timeout_time_wait = 2 MINS;
103	unsigned long nf_ct_tcp_timeout_close = 10 SECS;	103	unsigned int nf_ct_tcp_timeout_close = 10 SECS;
104		104
105	/* RFC1122 says the R2 limit should be at least 100 seconds.	105	/* RFC1122 says the R2 limit should be at least 100 seconds.
106	Linux uses 15 packets as limit, which corresponds	106	Linux uses 15 packets as limit, which corresponds
107	to ~13-30min depending on RTO. */	107	to ~13-30min depending on RTO. */
108	unsigned long nf_ct_tcp_timeout_max_retrans = 5 MINS;	108	unsigned int nf_ct_tcp_timeout_max_retrans = 5 MINS;
109		109
110	static unsigned long * tcp_timeouts[]	110	static unsigned int * tcp_timeouts[]
111	= { NULL, /* TCP_CONNTRACK_NONE */	111	= { NULL, /* TCP_CONNTRACK_NONE */
112	&nf_ct_tcp_timeout_syn_sent, /* TCP_CONNTRACK_SYN_SENT, */	112	&nf_ct_tcp_timeout_syn_sent, /* TCP_CONNTRACK_SYN_SENT, */
113	&nf_ct_tcp_timeout_syn_recv, /* TCP_CONNTRACK_SYN_RECV, */	113	&nf_ct_tcp_timeout_syn_recv, /* TCP_CONNTRACK_SYN_RECV, */


diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c index 1a592a556182..4264dd079a16 100644 --- a/net/netfilter/nf_conntrack_proto_udp.c +++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -27,8 +27,8 @@
27	#include <linux/netfilter_ipv6.h>	27	#include <linux/netfilter_ipv6.h>
28	#include <net/netfilter/nf_conntrack_protocol.h>	28	#include <net/netfilter/nf_conntrack_protocol.h>
29		29
30	unsigned long nf_ct_udp_timeout = 30*HZ;	30	unsigned int nf_ct_udp_timeout = 30*HZ;
31	unsigned long nf_ct_udp_timeout_stream = 180*HZ;	31	unsigned int nf_ct_udp_timeout_stream = 180*HZ;
32		32
33	static int udp_pkt_to_tuple(const struct sk_buff *skb,	33	static int udp_pkt_to_tuple(const struct sk_buff *skb,
34	unsigned int dataoff,	34	unsigned int dataoff,


diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index d17e42b28c79..3531d142f693 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -431,25 +431,25 @@ extern int nf_conntrack_max;
431	extern unsigned int nf_conntrack_htable_size;	431	extern unsigned int nf_conntrack_htable_size;
432		432
433	/* From nf_conntrack_proto_tcp.c */	433	/* From nf_conntrack_proto_tcp.c */
434	extern unsigned long nf_ct_tcp_timeout_syn_sent;	434	extern unsigned int nf_ct_tcp_timeout_syn_sent;
435	extern unsigned long nf_ct_tcp_timeout_syn_recv;	435	extern unsigned int nf_ct_tcp_timeout_syn_recv;
436	extern unsigned long nf_ct_tcp_timeout_established;	436	extern unsigned int nf_ct_tcp_timeout_established;
437	extern unsigned long nf_ct_tcp_timeout_fin_wait;	437	extern unsigned int nf_ct_tcp_timeout_fin_wait;
438	extern unsigned long nf_ct_tcp_timeout_close_wait;	438	extern unsigned int nf_ct_tcp_timeout_close_wait;
439	extern unsigned long nf_ct_tcp_timeout_last_ack;	439	extern unsigned int nf_ct_tcp_timeout_last_ack;
440	extern unsigned long nf_ct_tcp_timeout_time_wait;	440	extern unsigned int nf_ct_tcp_timeout_time_wait;
441	extern unsigned long nf_ct_tcp_timeout_close;	441	extern unsigned int nf_ct_tcp_timeout_close;
442	extern unsigned long nf_ct_tcp_timeout_max_retrans;	442	extern unsigned int nf_ct_tcp_timeout_max_retrans;
443	extern int nf_ct_tcp_loose;	443	extern int nf_ct_tcp_loose;
444	extern int nf_ct_tcp_be_liberal;	444	extern int nf_ct_tcp_be_liberal;
445	extern int nf_ct_tcp_max_retrans;	445	extern int nf_ct_tcp_max_retrans;
446		446
447	/* From nf_conntrack_proto_udp.c */	447	/* From nf_conntrack_proto_udp.c */
448	extern unsigned long nf_ct_udp_timeout;	448	extern unsigned int nf_ct_udp_timeout;
449	extern unsigned long nf_ct_udp_timeout_stream;	449	extern unsigned int nf_ct_udp_timeout_stream;
450		450
451	/* From nf_conntrack_proto_generic.c */	451	/* From nf_conntrack_proto_generic.c */
452	extern unsigned long nf_ct_generic_timeout;	452	extern unsigned int nf_ct_generic_timeout;
453		453
454	/* Log invalid packets of a given protocol */	454	/* Log invalid packets of a given protocol */
455	static int log_invalid_proto_min = 0;	455	static int log_invalid_proto_min = 0;