Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72b55823 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[NETFILTER]: conntrack: fix SYSCTL=n compile

parent 3bc38712
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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[] = {
+2 −2
Original line number Diff line number Diff line
@@ -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[] = {