netfilter: remove CONFIG_NF_CT_ACCT
Subsystems (3)
PATCH 1/1 netfilter: remove CONFIG_NF_CT_ACCT
remove CONFIG_NF_CT_ACCT
Accounting can now be enabled/disabled without kernel recompilation. Currently used only to set a default value for a feature that is also controlled by a kernel/module/sysfs/sysctl parameter.
----Documentation/feature-removal-schedule.txt | 9 --------- net/netfilter/Kconfig | 22 ---------------------- net/netfilter/nf_conntrack_acct.c | 10 ---------- net/netfilter/nf_conntrack_netlink.c | 2 --
4 files changed, 43 deletions(-)
net/netfilter/Kconfig +0 -22
@@ -40,27 +40,6 @@ config NF_CONNTRACK if NF_CONNTRACK -config NF_CT_ACCT - bool "Connection tracking flow accounting" - depends on NETFILTER_ADVANCED - help - If this option is enabled, the connection tracking code will - keep per-flow packet and byte counters. - - Those counters can be used for flow-based accounting or the - `connbytes' match. - - Please note that currently this option only sets a default state. - You may change it at boot time with nf_conntrack.acct=0/1 kernel - parameter or by loading the nf_conntrack module with acct=0/1. - - You may also disable/enable it on a running system with: - sysctl net.netfilter.nf_conntrack_acct=0/1 - - This option will be removed in 2.6.29. - - If unsure, say `N'. - config NF_CONNTRACK_MARK bool 'Connection mark tracking support' depends on NETFILTER_ADVANCED
@@ -557,7 +536,6 @@ config NETFILTER_XT_MATCH_CONNBYTES tristate '"connbytes" per-connection counter match support' depends on NF_CONNTRACK depends on NETFILTER_ADVANCED - select NF_CT_ACCT help This option adds a `connbytes' match, which allows you to match the number of bytes and/or packets for each direction within a connection.
net/netfilter/nf_conntrack_acct.c +0 -10
@@ -16,11 +16,7 @@#include <net/netfilter/nf_conntrack_extend.h> #include <net/netfilter/nf_conntrack_acct.h> -#ifdef CONFIG_NF_CT_ACCT -#define NF_CT_ACCT_DEFAULT 1 -#else #define NF_CT_ACCT_DEFAULT 0 -#endif static int nf_ct_acct__read_mostly =NF_CT_ACCT_DEFAULT ;
@@ -114,12 +110,6 @@ int nf_conntrack_acct_init(struct net *net) net->ct.sysctl_acct = nf_ct_acct;if (net_eq (net, &init_net)) { -#ifdef CONFIG_NF_CT_ACCT -printk (KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n" ); -printk (KERN_WARNING "nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack module option or\n" ); -printk (KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n" ); -#endif - ret =nf_ct_extend_register (&acct_extend);if (ret <0 ) {printk (KERN_ERR "nf_conntrack_acct: Unable to register extension\n" );
net/netfilter/nf_conntrack_netlink.c +0 -2
@@ -430,11 +430,9 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct) +3 *nla_total_size (sizeof (u_int8_t))/* CTA_PROTO_NUM */ +nla_total_size (sizeof (u_int32_t))/* CTA_ID */ +nla_total_size (sizeof (u_int32_t))/* CTA_STATUS */ -#ifdef CONFIG_NF_CT_ACCT +2 *nla_total_size (0 )/* CTA_COUNTERS_ORIG|REPL */ +2 *nla_total_size (sizeof (uint64_t ))/* CTA_COUNTERS_PACKETS */ +2 *nla_total_size (sizeof (uint64_t ))/* CTA_COUNTERS_BYTES */ -#endif +nla_total_size (sizeof (u_int32_t))/* CTA_TIMEOUT */ +nla_total_size (0 )/* CTA_PROTOINFO */ +nla_total_size (0 )/* CTA_HELP */
Documentation/feature-removal-schedule.txt +0 -9
@@ -345,15 +345,6 @@ Who: Johannes Berg <[email protected]> --------------------------- -What: CONFIG_NF_CT_ACCT -When: 2.6.29 -Why: Accounting can now be enabled/disabled without kernel recompilation. - Currently used only to set a default value for a feature that is also - controlled by a kernel/module/sysfs/sysctl parameter. -Who: Krzysztof Piotr Oledzki <[email protected]> - ---------------------------- - What: sysfs ui for changing p4-clockmod parameters When: September 2009 Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
Quoted 5 lines · Changli Gao
remove
CONFIG_NF_CT_ACCTAccounting can now be enabled/disabled without kernel recompilation. Currently used only to set a default value for a feature that is also controlled by a
kernel/module/sysfs/sysctlparameter.
We need to automatically enable this when the connbytes match is used. Krzysztof is working on a patch to do that.