]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: nf_nat: merge ip/ip6 masquerade headers
authorFlorian Westphal <fw@strlen.de>
Tue, 9 Apr 2019 08:44:06 +0000 (10:44 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 11 Apr 2019 18:59:21 +0000 (20:59 +0200)
commite3096afa141a2e36b4f48f5db3631754e6ae4ddc
tree2fc443bf49240b24160cd1fe244bc8ebefc91623
parent7fa7813ca0d9601aa52d60ec5c0f7bc26fd6145e
netfilter: nf_nat: merge ip/ip6 masquerade headers

Both are now implemented by nf_nat_masquerade.c, so no need to keep
different headers.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/ipv4/nf_nat_masquerade.h [deleted file]
include/net/netfilter/ipv6/nf_nat_masquerade.h [deleted file]
include/net/netfilter/nf_nat_masquerade.h [new file with mode: 0644]
net/ipv4/netfilter/ipt_MASQUERADE.c
net/ipv6/netfilter/ip6t_MASQUERADE.c
net/netfilter/nf_nat_masquerade.c
net/netfilter/nft_masq.c