diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 05:35:08 -0400 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:08 -0400 |
commit | c04d05529a6e0bf97183a2caf76a0c7f07f5b78c (patch) | |
tree | 9d4df449b3a294b150d1c77ac4a4767e27e4a5df /net/netfilter/nf_conntrack_standalone.c | |
parent | 802507071b72ed5025747126099cbc6d1542f596 (diff) |
netfilter: netns nf_conntrack: per-netns net.netfilter.nf_conntrack_checksum sysctl
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter/nf_conntrack_standalone.c')
-rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 64b4f95b367..5cd06637977 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c | |||
@@ -322,9 +322,6 @@ static void nf_conntrack_standalone_fini_proc(struct net *net) | |||
322 | 322 | ||
323 | /* Sysctl support */ | 323 | /* Sysctl support */ |
324 | 324 | ||
325 | int nf_conntrack_checksum __read_mostly = 1; | ||
326 | EXPORT_SYMBOL_GPL(nf_conntrack_checksum); | ||
327 | |||
328 | #ifdef CONFIG_SYSCTL | 325 | #ifdef CONFIG_SYSCTL |
329 | /* Log invalid packets of a given protocol */ | 326 | /* Log invalid packets of a given protocol */ |
330 | static int log_invalid_proto_min = 0; | 327 | static int log_invalid_proto_min = 0; |
@@ -360,7 +357,7 @@ static ctl_table nf_ct_sysctl_table[] = { | |||
360 | { | 357 | { |
361 | .ctl_name = NET_NF_CONNTRACK_CHECKSUM, | 358 | .ctl_name = NET_NF_CONNTRACK_CHECKSUM, |
362 | .procname = "nf_conntrack_checksum", | 359 | .procname = "nf_conntrack_checksum", |
363 | .data = &nf_conntrack_checksum, | 360 | .data = &init_net.ct.sysctl_checksum, |
364 | .maxlen = sizeof(unsigned int), | 361 | .maxlen = sizeof(unsigned int), |
365 | .mode = 0644, | 362 | .mode = 0644, |
366 | .proc_handler = &proc_dointvec, | 363 | .proc_handler = &proc_dointvec, |
@@ -425,6 +422,7 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net) | |||
425 | goto out_kmemdup; | 422 | goto out_kmemdup; |
426 | 423 | ||
427 | table[1].data = &net->ct.count; | 424 | table[1].data = &net->ct.count; |
425 | table[3].data = &net->ct.sysctl_checksum; | ||
428 | 426 | ||
429 | net->ct.sysctl_header = register_net_sysctl_table(net, | 427 | net->ct.sysctl_header = register_net_sysctl_table(net, |
430 | nf_net_netfilter_sysctl_path, table); | 428 | nf_net_netfilter_sysctl_path, table); |
@@ -474,6 +472,7 @@ static int nf_conntrack_net_init(struct net *net) | |||
474 | ret = nf_conntrack_standalone_init_proc(net); | 472 | ret = nf_conntrack_standalone_init_proc(net); |
475 | if (ret < 0) | 473 | if (ret < 0) |
476 | goto out_proc; | 474 | goto out_proc; |
475 | net->ct.sysctl_checksum = 1; | ||
477 | ret = nf_conntrack_standalone_init_sysctl(net); | 476 | ret = nf_conntrack_standalone_init_sysctl(net); |
478 | if (ret < 0) | 477 | if (ret < 0) |
479 | goto out_sysctl; | 478 | goto out_sysctl; |