diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-01-09 17:48:09 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-10 12:54:35 -0800 |
| commit | babbdb1a18d37e57acae7e348ef122f2b905df0a (patch) | |
| tree | 51bb7dbffe28ae6f342e0bcc155a54264f30b5e5 /net/ipv6 | |
| parent | 9d28026b7ec0f3e2a407d5c03fcb37d0b59d1add (diff) | |
| download | kernel_samsung_espresso10-babbdb1a18d37e57acae7e348ef122f2b905df0a.zip kernel_samsung_espresso10-babbdb1a18d37e57acae7e348ef122f2b905df0a.tar.gz kernel_samsung_espresso10-babbdb1a18d37e57acae7e348ef122f2b905df0a.tar.bz2 | |
[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>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index 704fbbe..e57d6fc 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; |