From patchwork Fri Sep 14 01:40:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 183771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46E8A2C0087 for ; Fri, 14 Sep 2012 11:40:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752174Ab2INBkm (ORCPT ); Thu, 13 Sep 2012 21:40:42 -0400 Received: from ares07.inai.de ([5.9.24.206]:46549 "EHLO seven.medozas.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200Ab2INBkl (ORCPT ); Thu, 13 Sep 2012 21:40:41 -0400 Received: by seven.medozas.de (Postfix, from userid 25121) id 493D796A07CC; Fri, 14 Sep 2012 03:40:37 +0200 (CEST) From: Jan Engelhardt 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 Message-Id: <1347586832-6190-1-git-send-email-jengelh@inai.de> X-Mailer: git-send-email 1.7.7 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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