aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/Makefile
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-12-13 16:01:33 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2018-12-17 23:33:29 +0100
commitfaec18dbb0405c7d4dda025054511dc3a6696918 (patch)
tree0192158203a6dd89d17b2c0b4d9ad35480d73470 /net/netfilter/Makefile
parentnetfilter: nat: remove l4proto->nlattr_to_range (diff)
downloadlinux-dev-faec18dbb0405c7d4dda025054511dc3a6696918.tar.xz
linux-dev-faec18dbb0405c7d4dda025054511dc3a6696918.zip
netfilter: nat: remove l4proto->manip_pkt
This removes the last l4proto indirection, the two callers, the l3proto packet mangling helpers for ipv4 and ipv6, now call the nf_nat_l4proto_manip_pkt() helper. nf_nat_proto_{dccp,tcp,sctp,gre,icmp,icmpv6} are left behind, even though they contain no functionality anymore to not clutter this patch. Next patch will remove the empty files and the nf_nat_l4proto struct. nf_nat_proto_udp.c is renamed to nf_nat_proto.c, as it now contains the other nat manip functionality as well, not just udp and udplite. 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/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 852e47cd769b..ed4a912c5484 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -48,7 +48,7 @@ obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
nf_nat-y := nf_nat_core.o nf_nat_proto_unknown.o \
- nf_nat_proto_udp.o nf_nat_proto_tcp.o nf_nat_helper.o
+ nf_nat_proto.o nf_nat_proto_tcp.o nf_nat_helper.o
# NAT protocols (nf_nat)
nf_nat-$(CONFIG_NF_NAT_PROTO_DCCP) += nf_nat_proto_dccp.o