diff options
| author | Florian Westphal <fw@strlen.de> | 2016-12-20 21:57:02 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-01-03 14:33:25 +0100 |
| commit | e4781421e883340b796da5a724bda7226817990b (patch) | |
| tree | 67746198bd1441abdae6a35a39fc921ff751049d /net/netfilter/Makefile | |
| parent | 0a0a8d6b0e88d947d7ab3198b325e31f677bebc2 (diff) | |
| download | linux-0-day-e4781421e883340b796da5a724bda7226817990b.tar.gz linux-0-day-e4781421e883340b796da5a724bda7226817990b.tar.xz | |
netfilter: merge udp and udplite conntrack helpers
udplite was copied from udp, they are virtually 100% identical.
This adds udplite tracker to udp instead, removes udplite module,
and then makes the udplite tracker builtin.
udplite will then simply re-use udp timeout settings.
It makes little sense to add separate sysctls, nowadays we have
fine-grained timeout policy support via the CT target.
old:
text data bss dec hex filename
1633 672 0 2305 901 nf_conntrack_proto_udp.o
1756 672 0 2428 97c nf_conntrack_proto_udplite.o
69526 17937 268 87731 156b3 nf_conntrack.ko
new:
text data bss dec hex filename
2442 1184 0 3626 e2a nf_conntrack_proto_udp.o
68565 17721 268 86554 1521a nf_conntrack.ko
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/Makefile')
| -rw-r--r-- | net/netfilter/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index ca30d1960f1db..bf5c577113b6e 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -7,7 +7,6 @@ nf_conntrack-$(CONFIG_NF_CONNTRACK_EVENTS) += nf_conntrack_ecache.o nf_conntrack-$(CONFIG_NF_CONNTRACK_LABELS) += nf_conntrack_labels.o nf_conntrack-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o nf_conntrack-$(CONFIG_NF_CT_PROTO_SCTP) += nf_conntrack_proto_sctp.o -nf_conntrack-$(CONFIG_NF_CT_PROTO_UDPLITE) += nf_conntrack_proto_udplite.o obj-$(CONFIG_NETFILTER) = netfilter.o |