projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3b0a081) | patch
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)
commitbf8981a2aa082d9d64771b47c8a1c9c388d8cd40
tree2fc443bf49240b24160cd1fe244bc8ebefc91623tree | snapshot
parent3b0a081db1f730373993c7a27936778402a3322ccommit | diff
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] blob | blame | history
include/net/netfilter/ipv6/nf_nat_masquerade.h [deleted file] blob | blame | history
include/net/netfilter/nf_nat_masquerade.h [new file with mode: 0644] blob
net/ipv4/netfilter/ipt_MASQUERADE.c diff | blob | blame | history
net/ipv6/netfilter/ip6t_MASQUERADE.c diff | blob | blame | history
net/netfilter/nf_nat_masquerade.c diff | blob | blame | history
net/netfilter/nft_masq.c diff | blob | blame | history
Linux 6.x block layer and io_uring tree(s)