]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[NETFILTER]: conntrack: fix SYSCTL=n compile
authorAdrian Bunk <bunk@stusta.de>
Tue, 25 Jul 2006 05:53:12 +0000 (22:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Jul 2006 05:53:12 +0000 (22:53 -0700)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/ip_conntrack_standalone.c
net/netfilter/nf_conntrack_standalone.c

index 7bd3c22003a20a84b9e92479db92a0c1b871edcf..7a9fa04a467a2b807c7fed4d16245fa7201dab04 100644 (file)
@@ -534,6 +534,8 @@ static struct nf_hook_ops ip_conntrack_ops[] = {
 
 /* Sysctl support */
 
+int ip_conntrack_checksum = 1;
+
 #ifdef CONFIG_SYSCTL
 
 /* From ip_conntrack_core.c */
@@ -568,8 +570,6 @@ extern unsigned int ip_ct_generic_timeout;
 static int log_invalid_proto_min = 0;
 static int log_invalid_proto_max = 255;
 
-int ip_conntrack_checksum = 1;
-
 static struct ctl_table_header *ip_ct_sysctl_header;
 
 static ctl_table ip_ct_sysctl_table[] = {
index 5fcab2ef231f56d62d5f39deb8ec7b1bc0117e05..4ef8366999623b6723a9e104e56c1ba673989b8c 100644 (file)
@@ -428,6 +428,8 @@ static struct file_operations ct_cpu_seq_fops = {
 
 /* Sysctl support */
 
+int nf_conntrack_checksum = 1;
+
 #ifdef CONFIG_SYSCTL
 
 /* From nf_conntrack_core.c */
@@ -459,8 +461,6 @@ extern unsigned int nf_ct_generic_timeout;
 static int log_invalid_proto_min = 0;
 static int log_invalid_proto_max = 255;
 
-int nf_conntrack_checksum = 1;
-
 static struct ctl_table_header *nf_ct_sysctl_header;
 
 static ctl_table nf_ct_sysctl_table[] = {