From patchwork Mon Apr 16 17:15:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 898813 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=strlen.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40PwF83QPbz9s3B for ; Tue, 17 Apr 2018 03:22:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752813AbeDPRWw (ORCPT ); Mon, 16 Apr 2018 13:22:52 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:46674 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752652AbeDPRWv (ORCPT ); Mon, 16 Apr 2018 13:22:51 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.89) (envelope-from ) id 1f87q6-0002sD-6w; Mon, 16 Apr 2018 19:22:50 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nf-next 6/6] netfilter: nat: merge nf_nat_redirect into nf_nat Date: Mon, 16 Apr 2018 19:15:58 +0200 Message-Id: <20180416171558.12756-7-fw@strlen.de> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180416171558.12756-1-fw@strlen.de> References: <20180416171558.12756-1-fw@strlen.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Similar to previous patch, this time, merge redirect+nat. The redirect module is just 2k in size, get rid of it and make redirect parts avaialble from the nat core. before: text data bss dec hex filename 16980 1272 4138 22390 5776 net/netfilter/nf_nat.ko 1383 792 0 2175 87f net/netfilter/nf_nat_redirect.ko after: 17953 1296 4138 23387 5b5b net/netfilter/nf_nat.ko Signed-off-by: Florian Westphal --- net/netfilter/Kconfig | 6 +----- net/netfilter/Makefile | 2 +- net/netfilter/nf_nat_redirect.c | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index c89fac1eb235..751b77292220 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -433,11 +433,7 @@ config NF_NAT_TFTP default NF_NAT && NF_CONNTRACK_TFTP config NF_NAT_REDIRECT - tristate "IPv4/IPv6 redirect support" - depends on NF_NAT - help - This is the kernel functionality to redirect packets to local - machine through NAT. + bool config NETFILTER_SYNPROXY tristate diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 3e24d852ee01..b291f2d343f0 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -55,7 +55,7 @@ obj-$(CONFIG_NF_LOG_COMMON) += nf_log_common.o obj-$(CONFIG_NF_LOG_NETDEV) += nf_log_netdev.o obj-$(CONFIG_NF_NAT) += nf_nat.o -obj-$(CONFIG_NF_NAT_REDIRECT) += nf_nat_redirect.o +nf_nat-$(CONFIG_NF_NAT_REDIRECT) += nf_nat_redirect.o # NAT helpers obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o diff --git a/net/netfilter/nf_nat_redirect.c b/net/netfilter/nf_nat_redirect.c index 25b06b959118..7e3e72fd5957 100644 --- a/net/netfilter/nf_nat_redirect.c +++ b/net/netfilter/nf_nat_redirect.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -124,6 +123,3 @@ nf_nat_redirect_ipv6(struct sk_buff *skb, const struct nf_nat_range *range, return nf_nat_setup_info(ct, &newrange, NF_NAT_MANIP_DST); } EXPORT_SYMBOL_GPL(nf_nat_redirect_ipv6); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Patrick McHardy ");