2017-04-01 13:36:40

by Simran Singhal

Subject: [PATCH] net: ipv4: netfilter: Remove unused function nf_nat_need_gre()

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 <[email protected]>
---
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);
--
2.7.4

2017-04-06 23:06:34

by Pablo Neira Ayuso

Subject: Re: [PATCH] net: ipv4: netfilter: Remove unused function nf_nat_need_gre()

On Sat, Apr 01, 2017 at 07:06:33PM +0530, simran singhal wrote:
> 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 <[email protected]>
> ---
> 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);

There is a good reason why we have this :)

By digging out and doing a bit of software archeology work via the
'git annotate' you know this triggers an explicit module dependency.