netfilter: masquerade: unify ip/ip6 notifier registration
Status from this message: Applied.
Get series with b4
b4 am [email protected]Versions newest first
Patches in v1 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | netfilter: nf_nat: merge ip/ip6 masquerade headersinclude/ include/ net/ +3 more | +13 | 0 replies | |
| 2/3 | netfilter: x_tables: merge ip and ipv6 masquerade modulesnet/ net/ net/ +5 more | +87 | 0 replies | |
| 3/3 | netfilter: nf_nat_masquerade: unify ipv4/6 notifier registrationinclude/ net/ net/ +1 more | +44 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH nf-next 0/3] netfilter: masquerade: unify ip/ip6 notifier registration
This series merges the ip/ip6 masquerade helpers.
The xtables masquerade modules are merged into a single module.
Florian Westphal (3):
netfilter: nf_nat: merge ip/ip6 masquerade headers
netfilter: x_tables: merge ip and ipv6 masquerade modules
netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration
include/net/netfilter/nf_nat_masquerade.h | 19 ++++ net/ipv4/netfilter/Kconfig | 12 -- net/ipv4/netfilter/Makefile | 1 net/ipv6/netfilter/Kconfig | 11 -- net/ipv6/netfilter/Makefile | 1 net/netfilter/Kconfig | 14 +++ net/netfilter/Makefile | 1 net/netfilter/nf_nat_masquerade.c | 104 +++++++++---------------- net/netfilter/nft_masq.c | 19 ---- net/netfilter/xt_MASQUERADE.c | 84 +++++++++++++------- include/net/netfilter/ipv4/nf_nat_masquerade.h | 15 --- include/net/netfilter/ipv6/nf_nat_masquerade.h | 11 -- net/ipv6/netfilter/ip6t_MASQUERADE.c | 81 ------------------- 13 files changed, 139 insertions(+), 234 deletions(-)