OSDN Git Service

netfilter: nat: remove nf_nat_l4proto struct
authorFlorian Westphal <fw@strlen.de>
Thu, 13 Dec 2018 15:01:34 +0000 (16:01 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 17 Dec 2018 22:33:31 +0000 (23:33 +0100)
commit5cbabeec1eb758233b35683123de446a57852932
tree2e629c74877b56930af5c2893a3f2edba50d9b44
parentfaec18dbb0405c7d4dda025054511dc3a6696918
netfilter: nat: remove nf_nat_l4proto struct

This removes the (now empty) nf_nat_l4proto struct, all its instances
and all the no longer needed runtime (un)register functionality.

nf_nat_need_gre() can be axed as well: the module that calls it (to
load the no-longer-existing nat_gre module) also calls other nat core
functions. GRE nat is now always available if kernel is built with it.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
18 files changed:
include/linux/netfilter/nf_conntrack_proto_gre.h
include/net/netfilter/nf_nat_l3proto.h
include/net/netfilter/nf_nat_l4proto.h
net/ipv4/netfilter/Makefile
net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
net/ipv4/netfilter/nf_nat_proto_gre.c [deleted file]
net/ipv4/netfilter/nf_nat_proto_icmp.c [deleted file]
net/ipv6/netfilter/Makefile
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
net/ipv6/netfilter/nf_nat_proto_icmpv6.c [deleted file]
net/netfilter/Makefile
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_nat_core.c
net/netfilter/nf_nat_proto.c
net/netfilter/nf_nat_proto_dccp.c [deleted file]
net/netfilter/nf_nat_proto_sctp.c [deleted file]
net/netfilter/nf_nat_proto_tcp.c [deleted file]
net/netfilter/nf_nat_proto_unknown.c [deleted file]