netfilter: conntrack: merge acct and helper sysctl table with main one
authorFlorian Westphal <fw@strlen.de>
Tue, 18 Dec 2018 22:04:47 +0000 (23:04 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 20 Dec 2018 23:51:48 +0000 (00:51 +0100)
commitd912dec124288553c734e25fef3ecfef92f894db
tree92cd98cf71cf63d5b1ad2b85936e302cf087617b
parent4a65798a94089f31883eee705f580e4b2d734ecf
netfilter: conntrack: merge acct and helper sysctl table with main one

Needless copy&paste, just handle all in one.  Next patch will handle
acct and timestamp, which have similar functions.

Intentionally leaves cruft behind, will be cleaned up in a followup
patch.

The obsolete sysctl pointers in netns_ct struct are left in place and
removed in a single change, as changes to netns trigger rebuild of
almost all files.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_acct.c
net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_conntrack_standalone.c