Patchwork netfilter: xt_CT: remove a compile warning

login
register
mail settings
Submitter Pablo Neira
Date April 3, 2012, 8:17 a.m.
Message ID <20120403081728.GA19753@1984>
Download mbox | patch
Permalink /patch/150335/
State RFC
Delegated to: David Miller
Headers show

Comments

Pablo Neira - April 3, 2012, 8:17 a.m.
On Tue, Apr 03, 2012 at 05:48:22AM +0200, Eric Dumazet wrote:
> If CONFIG_NF_CONNTRACK_TIMEOUT=n we have following warning :
> 
>   CC [M]  net/netfilter/xt_CT.o
> net/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’:
> net/netfilter/xt_CT.c:284: warning: label ‘err4’ defined but not used

Thanks Eric.

I think I prefer the one attached.

I 'll pass it to davem with a couple of other minor fixes anytime soon.
Eric Dumazet - April 3, 2012, 8:31 a.m.
On Tue, 2012-04-03 at 10:17 +0200, Pablo Neira Ayuso wrote:
> On Tue, Apr 03, 2012 at 05:48:22AM +0200, Eric Dumazet wrote:
> > If CONFIG_NF_CONNTRACK_TIMEOUT=n we have following warning :
> > 
> >   CC [M]  net/netfilter/xt_CT.o
> > net/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’:
> > net/netfilter/xt_CT.c:284: warning: label ‘err4’ defined but not used
> 
> Thanks Eric.
> 
> I think I prefer the one attached.
> 
> I 'll pass it to davem with a couple of other minor fixes anytime soon.

Its your call, but you should move the whole

#if CONFIG_NF_CONNTRACK_TIMEOUT
	... lot of lines ...
#endif

in a helper function to make things a bit more maintainable






--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira - April 3, 2012, 9:35 a.m.
On Tue, Apr 03, 2012 at 10:31:23AM +0200, Eric Dumazet wrote:
> On Tue, 2012-04-03 at 10:17 +0200, Pablo Neira Ayuso wrote:
> > On Tue, Apr 03, 2012 at 05:48:22AM +0200, Eric Dumazet wrote:
> > > If CONFIG_NF_CONNTRACK_TIMEOUT=n we have following warning :
> > > 
> > >   CC [M]  net/netfilter/xt_CT.o
> > > net/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’:
> > > net/netfilter/xt_CT.c:284: warning: label ‘err4’ defined but not used
> > 
> > Thanks Eric.
> > 
> > I think I prefer the one attached.
> > 
> > I 'll pass it to davem with a couple of other minor fixes anytime soon.
> 
> Its your call, but you should move the whole
> 
> #if CONFIG_NF_CONNTRACK_TIMEOUT
> 	... lot of lines ...
> #endif
> 
> in a helper function to make things a bit more maintainable

I will, thanks for the suggestion.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

From 44b52bccf855b0706de624c29fc3d82ca954bb4e Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 3 Apr 2012 10:08:48 +0200
Subject: [PATCH] netfilter: xt_CT: remove a compile warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If CONFIG_NF_CONNTRACK_TIMEOUT=n we have following warning :

  CC [M]  net/netfilter/xt_CT.o
net/netfilter/xt_CT.c: In function ‘xt_ct_tg_check_v1’:
net/netfilter/xt_CT.c:284: warning: label ‘err4’ defined but not used

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/xt_CT.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 0c8e438..138b75e 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -281,8 +281,10 @@  out:
 	info->ct = ct;
 	return 0;
 
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
 err4:
 	rcu_read_unlock();
+#endif
 err3:
 	nf_conntrack_free(ct);
 err2:
-- 
1.7.2.5