Re: netfilter: nf_nat: make find/put static

* Re: netfilter: nf_nat: make find/put static
       [not found] <201010231923.o9NJN2oc012438@hera.kernel.org>
@ 2010-10-28 18:42   ` Geert Uytterhoeven
  0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2010-10-28 18:42 UTC (permalink / raw)
  To: Stephen Hemminger, Patrick McHardy, Andrew Morton
  Cc: Linux Kernel Mailing List, netfilter-devel

On Sat, Oct 23, 2010 at 21:23, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org> wrote:
> Gitweb:     http://git.kernel.org/linus/0c200d935346fe0ebde9b6dffbb683dddd166fb9
> Commit:     0c200d935346fe0ebde9b6dffbb683dddd166fb9
> Parent:     758ff03387228824617cef9507e5682488bf9e0c
> Author:     Stephen Hemminger <shemminger@vyatta.com>
> AuthorDate: Mon Oct 4 20:53:18 2010 +0200
> Committer:  Patrick McHardy <kaber@trash.net>
> CommitDate: Mon Oct 4 20:53:18 2010 +0200
>
>    netfilter: nf_nat: make find/put static
>
>    The functions nf_nat_proto_find_get and nf_nat_proto_put are
>    only used internally in nf_nat_core. This might break some out
>    of tree NAT module.
>
>    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>    Signed-off-by: Patrick McHardy <kaber@trash.net>
> ---
>  include/net/netfilter/nf_nat_protocol.h |    3 ---
>  net/ipv4/netfilter/nf_nat_core.c        |    6 ++----
>  2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h
> index df17bac..93cc90d 100644
> --- a/include/net/netfilter/nf_nat_protocol.h
> +++ b/include/net/netfilter/nf_nat_protocol.h
> @@ -45,9 +45,6 @@ struct nf_nat_protocol {
>  extern int nf_nat_protocol_register(const struct nf_nat_protocol *proto);
>  extern void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto);
>
> -extern const struct nf_nat_protocol *nf_nat_proto_find_get(u_int8_t protocol);
> -extern void nf_nat_proto_put(const struct nf_nat_protocol *proto);
> -
>  /* Built-in protocols. */
>  extern const struct nf_nat_protocol nf_nat_protocol_tcp;
>  extern const struct nf_nat_protocol nf_nat_protocol_udp;
> diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
> index 2c084b3..e2e00c4 100644
> --- a/net/ipv4/netfilter/nf_nat_core.c
> +++ b/net/ipv4/netfilter/nf_nat_core.c
> @@ -47,7 +47,7 @@ __nf_nat_proto_find(u_int8_t protonum)
>        return rcu_dereference(nf_nat_protos[protonum]);
>  }
>
> -const struct nf_nat_protocol *
> +static const struct nf_nat_protocol *
>  nf_nat_proto_find_get(u_int8_t protonum)
>  {
>        const struct nf_nat_protocol *p;
> @@ -60,14 +60,12 @@ nf_nat_proto_find_get(u_int8_t protonum)
>
>        return p;
>  }
> -EXPORT_SYMBOL_GPL(nf_nat_proto_find_get);
>
> -void
> +static void
>  nf_nat_proto_put(const struct nf_nat_protocol *p)
>  {
>        module_put(p->me);
>  }
> -EXPORT_SYMBOL_GPL(nf_nat_proto_put);
>
>  /* We keep an extra hash for each conntrack, for fast searching. */
>  static inline unsigned int

They should be moved inside the
"#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)",
as I now get:

net/ipv4/netfilter/nf_nat_core.c:52: warning: ‘nf_nat_proto_find_get’
defined but not used
net/ipv4/netfilter/nf_nat_core.c:66: warning: ‘nf_nat_proto_put’
defined but not used

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 4+ messages in thread