Skip to content

netfilter: masquerade: unify ip/ip6 notifier registration

Florian Westphal netfilter-devel 1 version Applied

Status from this message: Applied.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 1 replyApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3netfilter: nf_nat: merge ip/ip6 masquerade headersinclude/net/netfilter/ipv6/nf_nat_masquerade.h include/net/netfilter/nf_nat_masquerade.h net/ipv4/netfilter/ipt_MASQUERADE.c +3 more+13 -200 replies
2/3netfilter: x_tables: merge ip and ipv6 masquerade modulesnet/ipv4/netfilter/Kconfig net/ipv4/netfilter/Makefile net/ipv6/netfilter/Kconfig +5 more+87 -1240 replies
3/3netfilter: nf_nat_masquerade: unify ipv4/6 notifier registrationinclude/net/netfilter/nf_nat_masquerade.h net/netfilter/nf_nat_masquerade.c net/netfilter/nft_masq.c +1 more+44 -950 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

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(-)