Combine two modules

Hi,


please review, and if ok merge, this small set of two patches to the
new IPv6 NAT that recently gone in.

thanks,
Jan
===
The following changes since commit b0e61d98c672a9216d72d2d7430f6dc60795002e:

  Merge branch 'master' of git://1984.lsi.us.es/nf-next (2012-09-13 14:24:31 -0400)

are available in the git repository at:


  git://git.inai.de/linux master

for you to fetch changes up to 653e421b28fbf11842c60f9751d9589e95fbbca3:

  net: netfilter: combine ipt_REDIRECT and ip6t_REDIRECT (2012-09-14 02:33:48 +0200)

----------------------------------------------------------------
Jan Engelhardt (2):
      net: netfilter: combine ipt_NETMAP and ip6t_NETMAP
      net: netfilter: combine ipt_REDIRECT and ip6t_REDIRECT

 net/ipv4/netfilter/Kconfig         |   23 ++---
 net/ipv4/netfilter/Makefile        |    2 -
 net/ipv4/netfilter/ipt_NETMAP.c    |  101 -------------------
 net/ipv6/netfilter/Kconfig         |   21 ----
 net/ipv6/netfilter/Makefile        |    2 -
 net/ipv6/netfilter/ip6t_NETMAP.c   |   94 ------------------
 net/ipv6/netfilter/ip6t_REDIRECT.c |   98 -------------------
 net/netfilter/Kconfig              |   21 ++++
 net/netfilter/Makefile             |    2 +
 net/netfilter/xt_NETMAP.c          |  165 +++++++++++++++++++++++++++++++
 net/netfilter/xt_REDIRECT.c        |  190 ++++++++++++++++++++++++++++++++++++
 11 files changed, 388 insertions(+), 331 deletions(-)
 delete mode 100644 net/ipv4/netfilter/ipt_NETMAP.c
 delete mode 100644 net/ipv6/netfilter/ip6t_NETMAP.c
 delete mode 100644 net/ipv6/netfilter/ip6t_REDIRECT.c
 create mode 100644 net/netfilter/xt_NETMAP.c
 create mode 100644 net/netfilter/xt_REDIRECT.c
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html