From patchwork Sat Apr 1 13:36:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simran Singhal X-Patchwork-Id: 745968 X-Patchwork-Delegate: pablo@netfilter.org 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 3vwKCk6DhDz9rxm for ; Sun, 2 Apr 2017 00:36:50 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QEEl1MQj"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751772AbdDANgj (ORCPT ); Sat, 1 Apr 2017 09:36:39 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33774 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751542AbdDANgi (ORCPT ); Sat, 1 Apr 2017 09:36:38 -0400 Received: by mail-pg0-f66.google.com with SMTP id 79so22267623pgf.0; Sat, 01 Apr 2017 06:36:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=PGvq2VlkMgVG74x9VuMdzDD2TxJaqvXzxybgWL9rg+o=; b=QEEl1MQjeg3m255t/fziDixJq1COGseAamYcxZHf9qcCQLaTjg9068TbZbzQ77E6Ge LdcPMo3n2WP/kRzmodBKGdUKaoJE0d9FsOmxhNS+7El8sKILlJL8f/gI4zlG4b2qGeqf y14IFjHzuou4sCKO1TcD2ZAXe3c3WH8Jj116odJOwP8JNoGIAHnT0rbwmE/LjHhP8tHt nCxv6+sBn7gUHQfzRxkrVZady76GRy6Y0WD4w5MTPre0tVQ9YvjqrT7WaBni6su2UO7J 8q8wyqv08LQu1Nc66B498FNXUEWDdlObH8mKWrdnfetTvN3oj5RkxMprXKPpn094KjYR 8MhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=PGvq2VlkMgVG74x9VuMdzDD2TxJaqvXzxybgWL9rg+o=; b=qcQhvosqmMxZUv6R8KD1f+TNq7NyEbgRIuehx5xH/JrAsHTq0TvuYDMwccO8NxrfWl Jd3SgnmSKWidL3Aq9n933M+PtvrvlBFvudzB/RS13Yc+0S07Fvu49hN0BIDDQHF/ziC3 YrpPX9pR2L116iTKoFbfezioHk8I8FgyyMf69Fc3M4Cv0dqZAcRQl/Cl4LbHwyxVxWRC oCBe6srLeKYCQEjnfiagI/IrNBaOo1bgflu31gHWSdFK7Lucp1NaGoE8uxQq6IGO9kz/ 8aDig81WhXpmQ4Qo6S8ixwtjfQtwH4mAM0otFpWL/W/Drq02pW6TmaU6eoh+kZlcAICa wOqg== X-Gm-Message-State: AFeK/H2hm9lmyOU6Ata64TG30CDYfEnd0/qcRBF/y8LW+MtakFS0xGWX+3VpVoVoofPqOg== X-Received: by 10.84.194.195 with SMTP id h61mr9520063pld.182.1491053797506; Sat, 01 Apr 2017 06:36:37 -0700 (PDT) Received: from singhal-Inspiron-5558 ([14.139.82.6]) by smtp.gmail.com with ESMTPSA id y186sm16324761pfg.52.2017.04.01.06.36.36 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 01 Apr 2017 06:36:36 -0700 (PDT) Date: Sat, 1 Apr 2017 19:06:33 +0530 From: simran singhal To: pablo@netfilter.org Cc: Jozsef Kadlecsik , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: ipv4: netfilter: Remove unused function nf_nat_need_gre() Message-ID: <20170401133633.GA2208@singhal-Inspiron-5558> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The function nf_nat_need_gre() on being called, simply returns back. The function doesn't have FIXME code around. Hence, nf_nat_need_gre() and its calls have been removed. Signed-off-by: simran singhal --- net/ipv4/netfilter/nf_nat_pptp.c | 2 -- net/ipv4/netfilter/nf_nat_proto_gre.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c index b3ca21b..747e737 100644 --- a/net/ipv4/netfilter/nf_nat_pptp.c +++ b/net/ipv4/netfilter/nf_nat_pptp.c @@ -282,8 +282,6 @@ pptp_inbound_pkt(struct sk_buff *skb, static int __init nf_nat_helper_pptp_init(void) { - nf_nat_need_gre(); - BUG_ON(nf_nat_pptp_hook_outbound != NULL); RCU_INIT_POINTER(nf_nat_pptp_hook_outbound, pptp_outbound_pkt); diff --git a/net/ipv4/netfilter/nf_nat_proto_gre.c b/net/ipv4/netfilter/nf_nat_proto_gre.c index edf0500..c020a4d 100644 --- a/net/ipv4/netfilter/nf_nat_proto_gre.c +++ b/net/ipv4/netfilter/nf_nat_proto_gre.c @@ -142,9 +142,3 @@ static void __exit nf_nat_proto_gre_fini(void) module_init(nf_nat_proto_gre_init); module_exit(nf_nat_proto_gre_fini); - -void nf_nat_need_gre(void) -{ - return; -} -EXPORT_SYMBOL_GPL(nf_nat_need_gre);