2008-02-13 21:32:35

by Adrian Bunk

Subject: [2.6 patch] make secmark_tg_destroy() static

This patch makes the needlessly global secmark_tg_destroy() static.

Signed-off-by: Adrian Bunk <[email protected]>

---
df66d8d74309b41298ae011532fd284aad3ed2ba
diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
index 7708e20..c028485 100644
--- a/net/netfilter/xt_SECMARK.c
+++ b/net/netfilter/xt_SECMARK.c
@@ -111,7 +111,7 @@ secmark_tg_check(const char *tablename, const void *entry,
return true;
}

-void secmark_tg_destroy(const struct xt_target *target, void *targinfo)
+static void secmark_tg_destroy(const struct xt_target *target, void *targinfo)
{
switch (mode) {
case SECMARK_MODE_SEL:

2008-02-13 21:56:59

by Paul Moore

Subject: Re: [2.6 patch] make secmark_tg_destroy() static

On Wednesday 13 February 2008 4:29:40 pm Adrian Bunk wrote:
> This patch makes the needlessly global secmark_tg_destroy() static.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Thanks for catching this.

Acked-by: Paul Moore <[email protected]>

> ---
> df66d8d74309b41298ae011532fd284aad3ed2ba
> diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
> index 7708e20..c028485 100644
> --- a/net/netfilter/xt_SECMARK.c
> +++ b/net/netfilter/xt_SECMARK.c
> @@ -111,7 +111,7 @@ secmark_tg_check(const char *tablename, const
> void *entry, return true;
> }
>
> -void secmark_tg_destroy(const struct xt_target *target, void
> *targinfo) +static void secmark_tg_destroy(const struct xt_target
> *target, void *targinfo) {
> switch (mode) {
> case SECMARK_MODE_SEL:

--
paul moore
linux security @ hp

2008-02-13 23:42:22

by James Morris

Subject: Re: [2.6 patch] make secmark_tg_destroy() static

On Wed, 13 Feb 2008, Paul Moore wrote:

> On Wednesday 13 February 2008 4:29:40 pm Adrian Bunk wrote:
> > This patch makes the needlessly global secmark_tg_destroy() static.
> >
> > Signed-off-by: Adrian Bunk <[email protected]>
>
> Thanks for catching this.
>
> Acked-by: Paul Moore <[email protected]>
>

Applied -- will push to Linus unless the netfilter folk do it first.


- James
--
James Morris
<[email protected]>

2008-02-14 01:41:27

by David Miller

Subject: Re: [2.6 patch] make secmark_tg_destroy() static

From: Adrian Bunk <[email protected]>
Date: Wed, 13 Feb 2008 23:29:40 +0200

> This patch makes the needlessly global secmark_tg_destroy() static.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Applied.

2008-02-14 05:55:44

by David Miller

Subject: Re: [2.6 patch] make secmark_tg_destroy() static

From: James Morris <[email protected]>
Date: Thu, 14 Feb 2008 10:41:19 +1100 (EST)

> On Wed, 13 Feb 2008, Paul Moore wrote:
>
> > On Wednesday 13 February 2008 4:29:40 pm Adrian Bunk wrote:
> > > This patch makes the needlessly global secmark_tg_destroy() static.
> > >
> > > Signed-off-by: Adrian Bunk <[email protected]>
> >
> > Thanks for catching this.
> >
> > Acked-by: Paul Moore <[email protected]>
> >
>
> Applied -- will push to Linus unless the netfilter folk do it first.

I sucked it in, don't worry about it.