netfilter: conntrack: merge ecache and timestamp sysctl tables with main one

Browse source

Similar to previous change, this time for eache and timestamp.
Unlike helper and acct, these can be disabled at build time, so they
need ifdef guards.

Next patch will remove a few (now obsolete) functions.

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:48 +01:00 • committed by Pablo Neira Ayuso

parent d912dec124

commit cb2833ed00

3 changed files with 35 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_ecache.c

View file

33

net/netfilter/nf_conntrack_standalone.c

View file

65

net/netfilter/nf_conntrack_timestamp.c

View file