OSDN Git Service

netfilter: conntrack: merge ecache and timestamp sysctl tables with main one
authorFlorian Westphal <fw@strlen.de>
Tue, 18 Dec 2018 22:04:48 +0000 (23:04 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 20 Dec 2018 23:51:51 +0000 (00:51 +0100)
commitcb2833ed0044f910877b810077bc6da2ac5f09a2
tree9e63510a3586ca6825ac7b510cfb67a2ce3c2324
parentd912dec124288553c734e25fef3ecfef92f894db
netfilter: conntrack: merge ecache and timestamp sysctl tables with main one

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>
net/netfilter/nf_conntrack_ecache.c
net/netfilter/nf_conntrack_standalone.c
net/netfilter/nf_conntrack_timestamp.c