public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>, Pablo Neira Ayuso <pablo@netfilter.org>
Subject: [PATCH] netfilter: xt_CT: remove a compile warning
Date: Tue, 03 Apr 2012 05:48:22 +0200	[thread overview]
Message-ID: <1333424902.18626.36.camel@edumazet-glaptop> (raw)

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

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

diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 0c8e438..6d4ca2f 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -269,7 +269,9 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
 		} else {
 			ret = -ENOENT;
 			pr_info("Timeout policy base is empty\n");
-			goto err4;
+err4:
+			rcu_read_unlock();
+			goto err3;
 		}
 		rcu_read_unlock();
 	}
@@ -281,8 +283,6 @@ out:
 	info->ct = ct;
 	return 0;
 
-err4:
-	rcu_read_unlock();
 err3:
 	nf_conntrack_free(ct);
 err2:

             reply	other threads:[~2012-04-03  3:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-03  3:48 Eric Dumazet [this message]
2012-04-03  8:17 ` [PATCH] netfilter: xt_CT: remove a compile warning Pablo Neira Ayuso
2012-04-03  8:31   ` Eric Dumazet
2012-04-03  9:35     ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1333424902.18626.36.camel@edumazet-glaptop \
    --to=eric.dumazet@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox