[PATCH nf-next 0/3] netfilter: masquerade: unify ip/ip6 notifier registration

[Florian Westphal <fw@xxxxxxxxx>]

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