]> asedeno.scripts.mit.edu Git - linux.git/commit
netfilter: nf_tables: merge ipv4 and ipv6 nat chain types
authorFlorian Westphal <fw@strlen.de>
Thu, 28 Feb 2019 11:02:52 +0000 (12:02 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Fri, 1 Mar 2019 13:36:59 +0000 (14:36 +0100)
commitdb8ab38880e06dedbfc879e75f5b0ddc495f4eb6
tree91d214eda567b0608b88e4b4f8e5bbd2d353ac0a
parenta9ce849e786787af4b7dffd48d49b97b04671f8c
netfilter: nf_tables: merge ipv4 and ipv6 nat chain types

Merge the ipv4 and ipv6 nat chain type. This is the last
missing piece which allows to provide inet family support
for nat in a follow patch.

The kconfig knobs for ipv4/ipv6 nat chain are removed, the
nat chain type will be built unconditionally if NFT_NAT
expression is enabled.

Before:
   text    data     bss     dec     hex filename
   1576     896       0    2472     9a8 nft_chain_nat_ipv4.ko
   1697     896       0    2593     a21 nft_chain_nat_ipv6.ko

After:
   text    data     bss     dec     hex filename
   1832     896       0    2728     aa8 nft_chain_nat.ko

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile
net/ipv4/netfilter/nft_chain_nat_ipv4.c [deleted file]
net/ipv6/netfilter/Kconfig
net/ipv6/netfilter/Makefile
net/ipv6/netfilter/nft_chain_nat_ipv6.c [deleted file]
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/nft_chain_nat.c [new file with mode: 0644]