netfilter: nat: remove l4proto->manip_pkt
authorFlorian Westphal <fw@strlen.de>
Thu, 13 Dec 2018 15:01:33 +0000 (16:01 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 17 Dec 2018 22:33:29 +0000 (23:33 +0100)
commitfaec18dbb0405c7d4dda025054511dc3a6696918
tree0192158203a6dd89d17b2c0b4d9ad35480d73470
parent76b90019e03d866eab85cb57c2a6416ab94284dc
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>
16 files changed:
include/net/netfilter/nf_nat_l4proto.h
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
net/ipv4/netfilter/nf_nat_pptp.c
net/ipv4/netfilter/nf_nat_proto_gre.c
net/ipv4/netfilter/nf_nat_proto_icmp.c
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
net/ipv6/netfilter/nf_nat_proto_icmpv6.c
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/nf_nat_proto.c [new file with mode: 0644]
net/netfilter/nf_nat_proto_dccp.c
net/netfilter/nf_nat_proto_sctp.c
net/netfilter/nf_nat_proto_tcp.c
net/netfilter/nf_nat_proto_udp.c [deleted file]
net/netfilter/nf_nat_proto_unknown.c