[PATCH net-next] netfilter: xtables make functions local

[PATCH net-next] netfilter: xtables make functions local

[Stephen Hemminger]

A couple of functions only used in x_tables, don't need to be global

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

---
 include/linux/netfilter/x_tables.h |    2 --
 net/netfilter/x_tables.c           |    6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

--- a/include/linux/netfilter/x_tables.h	2013-12-24 15:14:54.502174551 -0800
+++ b/include/linux/netfilter/x_tables.h	2013-12-24 15:16:01.889269178 -0800
@@ -255,8 +255,6 @@ struct xt_table_info *xt_replace_table(s
 				       struct xt_table_info *newinfo,
 				       int *error);
 
-struct xt_match *xt_find_match(u8 af, const char *name, u8 revision);
-struct xt_target *xt_find_target(u8 af, const char *name, u8 revision);
 struct xt_match *xt_request_find_match(u8 af, const char *name, u8 revision);
 struct xt_target *xt_request_find_target(u8 af, const char *name, u8 revision);
 int xt_find_revision(u8 af, const char *name, u8 revision, int target,
--- a/net/netfilter/x_tables.c	2013-12-24 15:14:54.502174551 -0800
+++ b/net/netfilter/x_tables.c	2013-12-24 15:16:01.889269178 -0800
@@ -189,7 +189,7 @@ EXPORT_SYMBOL(xt_unregister_matches);
  */
 
 /* Find match, grabs ref.  Returns ERR_PTR() on error. */
-struct xt_match *xt_find_match(u8 af, const char *name, u8 revision)
+static struct xt_match *xt_find_match(u8 af, const char *name, u8 revision)
 {
 	struct xt_match *m;
 	int err = -ENOENT;
@@ -216,7 +216,6 @@ struct xt_match *xt_find_match(u8 af, co
 
 	return ERR_PTR(err);
 }
-EXPORT_SYMBOL(xt_find_match);
 
 struct xt_match *
 xt_request_find_match(uint8_t nfproto, const char *name, uint8_t revision)
@@ -234,7 +233,7 @@ xt_request_find_match(uint8_t nfproto, c
 EXPORT_SYMBOL_GPL(xt_request_find_match);
 
 /* Find target, grabs ref.  Returns ERR_PTR() on error. */
-struct xt_target *xt_find_target(u8 af, const char *name, u8 revision)
+static struct xt_target *xt_find_target(u8 af, const char *name, u8 revision)
 {
 	struct xt_target *t;
 	int err = -ENOENT;
@@ -261,7 +260,6 @@ struct xt_target *xt_find_target(u8 af,
 
 	return ERR_PTR(err);
 }
-EXPORT_SYMBOL(xt_find_target);
 
 struct xt_target *xt_request_find_target(u8 af, const char *name, u8 revision)
 {

Re: [PATCH net-next] netfilter: xtables make functions local

[David Miller]

From: Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 27 Dec 2013 12:09:37 -0800

> A couple of functions only used in x_tables, don't need to be global
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

I'll let Pablo pick this up, thanks.

Re: [PATCH net-next] netfilter: xtables make functions local

[Jan Engelhardt]

On Saturday 2013-12-28 07:21, David Miller wrote:

>From: Stephen Hemminger <stephen@networkplumber.org>
>Date: Fri, 27 Dec 2013 12:09:37 -0800
>
>> A couple of functions only used in x_tables, don't need to be global
>> 
>> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
>
>I'll let Pablo pick this up, thanks.

Negative, there is at least one known external modules using these.

Re: [PATCH net-next] netfilter: xtables make functions local

[Pablo Neira Ayuso]

On Sat, Dec 28, 2013 at 12:31:26PM +0100, Jan Engelhardt wrote:
> On Saturday 2013-12-28 07:21, David Miller wrote:
> 
> >From: Stephen Hemminger <stephen@networkplumber.org>
> >Date: Fri, 27 Dec 2013 12:09:37 -0800
> >
> >> A couple of functions only used in x_tables, don't need to be global
> >> 
> >> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> >
> >I'll let Pablo pick this up, thanks.
> 
> Negative, there is at least one known external modules using these.

Unfortunately, we cannot keep symbols for out of tree modules, that
has been the longterm policy.

Re: [PATCH net-next] netfilter: xtables make functions local

[Pablo Neira Ayuso]

On Fri, Dec 27, 2013 at 12:09:37PM -0800, Stephen Hemminger wrote:
> A couple of functions only used in x_tables, don't need to be global

Applied, thanks stephen.