netfilter: conntrack: merge acct and helper sysctl table with main one

Browse source

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>

...

This commit is contained in:

Florian Westphal 2018-12-18 23:04:47 +01:00 • committed by Pablo Neira Ayuso

parent 4a65798a94

commit d912dec124

3 changed files with 22 additions and 128 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

65

net/netfilter/nf_conntrack_acct.c

View file

64

net/netfilter/nf_conntrack_helper.c

View file

21

net/netfilter/nf_conntrack_standalone.c

View file