2017-12-10 23:33:13

by Colin King

Subject: [PATCH][netfilter-next] netfilter: conntrack: make struct nf_conntrack_l4proto_gre4 static

From: Colin Ian King <[email protected]>

The structure nf_conntrack_l4proto_gre4 is local to the source and does
not need to be in global scope, so make it static.

Cleans up sparse warning:
symbol 'nf_conntrack_l4proto_gre4' was not declared. Should it be static?

Signed-off-by: Colin Ian King <[email protected]>
---
net/netfilter/nf_conntrack_proto_gre.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c
index 6d8d1276cf3a..86c346ea1dd5 100644
--- a/net/netfilter/nf_conntrack_proto_gre.c
+++ b/net/netfilter/nf_conntrack_proto_gre.c
@@ -352,7 +352,7 @@ static int gre_init_net(struct net *net, u_int16_t proto)
}

/* protocol helper struct */
-struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
+static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
.l3proto = AF_INET,
.l4proto = IPPROTO_GRE,
.pkt_to_tuple = gre_pkt_to_tuple,
--
2.14.1

2017-12-11 09:19:51

by Florian Westphal

Subject: Re: [PATCH][netfilter-next] netfilter: conntrack: make struct nf_conntrack_l4proto_gre4 static

Colin King <[email protected]> wrote:
> From: Colin Ian King <[email protected]>
>
> The structure nf_conntrack_l4proto_gre4 is local to the source and does
> not need to be in global scope, so make it static.

This bug was added in
commit b9679a9fd3a7d36ea3deb2864a00cc413c5aae28
netfilter: conntrack: l4 protocol trackers can be const

> -struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
> +static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {

This should be 'static const'.

2017-12-18 10:59:24

by Pablo Neira Ayuso

Subject: Re: [PATCH][netfilter-next] netfilter: conntrack: make struct nf_conntrack_l4proto_gre4 static

On Mon, Dec 11, 2017 at 10:18:05AM +0100, Florian Westphal wrote:
> Colin King <[email protected]> wrote:
> > From: Colin Ian King <[email protected]>
> >
> > The structure nf_conntrack_l4proto_gre4 is local to the source and does
> > not need to be in global scope, so make it static.
>
> This bug was added in
> commit b9679a9fd3a7d36ea3deb2864a00cc413c5aae28
> netfilter: conntrack: l4 protocol trackers can be const

I have added Fixes: ... here.

> > -struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
> > +static struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
>
> This should be 'static const'.

I have mangled this patch to make it static const.

So Colin doesn't need to resend.

If there's anything else, let me know, I'll toss it and wait for a v2,
as you prefer.

Thanks.