diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2005-11-14 18:27:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-14 18:27:43 -0500 |
commit | 7686a02c0ebc11e4f881fe14db3df18569b7dbc1 (patch) | |
tree | 3fd8e9221881db36d8e1dd9562efa27fd36d344e /net/ipv6 | |
parent | 9bdf87d90bbd1a3e3183ac116a6a9d861f32baca (diff) |
[NETFILTER]: fix type of sysctl variables in nf_conntrack_ipv6
These variables should be unsigned. This fixes sysctl handler for
nf_ct_frag6_{low,high}_thresh.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
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 | 8 | ||||
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c index e2c90b3a8074..753a3ae8502b 100644 --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | |||
@@ -339,8 +339,8 @@ extern unsigned long 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 long nf_ct_frag6_timeout; |
342 | extern unsigned long nf_ct_frag6_low_thresh; | 342 | extern unsigned int nf_ct_frag6_low_thresh; |
343 | extern unsigned long nf_ct_frag6_high_thresh; | 343 | extern unsigned int nf_ct_frag6_high_thresh; |
344 | 344 | ||
345 | static struct ctl_table_header *nf_ct_ipv6_sysctl_header; | 345 | static struct ctl_table_header *nf_ct_ipv6_sysctl_header; |
346 | 346 | ||
@@ -367,7 +367,7 @@ static ctl_table nf_ct_sysctl_table[] = { | |||
367 | .data = &nf_ct_frag6_low_thresh, | 367 | .data = &nf_ct_frag6_low_thresh, |
368 | .maxlen = sizeof(unsigned int), | 368 | .maxlen = sizeof(unsigned int), |
369 | .mode = 0644, | 369 | .mode = 0644, |
370 | .proc_handler = &proc_dointvec_jiffies, | 370 | .proc_handler = &proc_dointvec, |
371 | }, | 371 | }, |
372 | { | 372 | { |
373 | .ctl_name = NET_NF_CONNTRACK_FRAG6_HIGH_THRESH, | 373 | .ctl_name = NET_NF_CONNTRACK_FRAG6_HIGH_THRESH, |
@@ -375,7 +375,7 @@ static ctl_table nf_ct_sysctl_table[] = { | |||
375 | .data = &nf_ct_frag6_high_thresh, | 375 | .data = &nf_ct_frag6_high_thresh, |
376 | .maxlen = sizeof(unsigned int), | 376 | .maxlen = sizeof(unsigned int), |
377 | .mode = 0644, | 377 | .mode = 0644, |
378 | .proc_handler = &proc_dointvec_jiffies, | 378 | .proc_handler = &proc_dointvec, |
379 | }, | 379 | }, |
380 | { .ctl_name = 0 } | 380 | { .ctl_name = 0 } |
381 | }; | 381 | }; |
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 7640b9bb7694..ed7603fe5fe3 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -55,9 +55,9 @@ | |||
55 | #define NF_CT_FRAG6_LOW_THRESH 196608 /* == 192*1024 */ | 55 | #define NF_CT_FRAG6_LOW_THRESH 196608 /* == 192*1024 */ |
56 | #define NF_CT_FRAG6_TIMEOUT IPV6_FRAG_TIMEOUT | 56 | #define NF_CT_FRAG6_TIMEOUT IPV6_FRAG_TIMEOUT |
57 | 57 | ||
58 | int nf_ct_frag6_high_thresh = 256*1024; | 58 | unsigned int nf_ct_frag6_high_thresh = 256*1024; |
59 | int nf_ct_frag6_low_thresh = 192*1024; | 59 | unsigned int nf_ct_frag6_low_thresh = 192*1024; |
60 | int nf_ct_frag6_timeout = IPV6_FRAG_TIMEOUT; | 60 | unsigned long nf_ct_frag6_timeout = IPV6_FRAG_TIMEOUT; |
61 | 61 | ||
62 | struct nf_ct_frag6_skb_cb | 62 | struct nf_ct_frag6_skb_cb |
63 | { | 63 | { |