From: Jan Engelhardt <jengelh@inai.de>
To: pablo@netfilter.org
Cc: davem@davemloft.net, kaber@trash.net, netfilter-devel@vger.kernel.org
Subject: Combine two modules
Date: Fri, 14 Sep 2012 03:40:30 +0200 [thread overview]
Message-ID: <1347586832-6190-1-git-send-email-jengelh@inai.de> (raw)
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
next reply other threads:[~2012-09-14 1:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 1:40 Jan Engelhardt [this message]
2012-09-14 1:40 ` [PATCH 1/2] net: netfilter: combine ipt_NETMAP and ip6t_NETMAP Jan Engelhardt
2012-09-14 11:38 ` Patrick McHardy
2012-09-21 10:09 ` Pablo Neira Ayuso
2012-09-14 1:40 ` [PATCH 2/2] net: netfilter: combine ipt_REDIRECT and ip6t_REDIRECT Jan Engelhardt
2012-09-14 11:53 ` Patrick McHardy
2012-09-21 10:11 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347586832-6190-1-git-send-email-jengelh@inai.de \
--to=jengelh@inai.de \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).