This series merges the remaining nat related modules: redir, masq,
and the nat chain type.
This is the last missing piece to add inet family nat support to nftables.
Florian Westphal (3):
netfilter: nf_tables: nat: merge nft_redir protocol specific modules
netfilter: nf_tables: nat: merge nft_masq protocol specific modules
netfilter: nf_tables: merge ipv4 and ipv6 nat chain types
net/ipv4/netfilter/Kconfig | 30 -----
net/ipv4/netfilter/Makefile | 3
net/ipv6/netfilter/Kconfig | 28 ----
net/ipv6/netfilter/Makefile | 3
net/netfilter/Kconfig | 4
net/netfilter/Makefile | 2
net/netfilter/nft_chain_nat.c |108 +++++++++++++++++++
net/netfilter/nft_masq.c |180 ++++++++++++++++++++++++++++--
net/netfilter/nft_redir.c |154 +++++++++++++++++++++++++--
include/net/netfilter/nft_masq.h | 22 ---
include/net/netfilter/nft_redir.h | 22 ---
net/ipv4/netfilter/nft_chain_nat_ipv4.c| 85 ---------------
net/ipv4/netfilter/nft_masq_ipv4.c | 90 ----------------
net/ipv4/netfilter/nft_redir_ipv4.c | 82 --------------
net/ipv6/netfilter/nft_chain_nat_ipv6.c| 83 --------------
net/ipv6/netfilter/nft_masq_ipv6.c | 91 ----------------
net/ipv6/netfilter/nft_redir_ipv6.c | 83 --------------
17 files changed, 422 insertions(+), 648 deletions(-)
