From patchwork Tue Apr 3 09:50:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 150362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D9386B6FE2 for ; Tue, 3 Apr 2012 19:51:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752644Ab2DCJvo (ORCPT ); Tue, 3 Apr 2012 05:51:44 -0400 Received: from mail.us.es ([193.147.175.20]:55629 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752910Ab2DCJvo (ORCPT ); Tue, 3 Apr 2012 05:51:44 -0400 Received: (qmail 17541 invoked from network); 3 Apr 2012 11:51:42 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 3 Apr 2012 11:51:42 +0200 Received: (qmail 4613 invoked by uid 507); 3 Apr 2012 09:51:41 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-99.2 required=7.5 tests=BAYES_50, USER_IN_WHITELIST autolearn=disabled version=3.3.1 Received: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.08 (clamdscan: 0.97.4/14735. Clear:RC:1(127.0.0.1):. Processed in 0.029548 secs); 03 Apr 2012 09:51:41 -0000 Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 3 Apr 2012 09:51:41 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/407/antivirus2); Tue, 03 Apr 2012 11:51:41 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus2) Received: (qmail 20477 invoked from network); 3 Apr 2012 11:51:40 +0200 Received: from berligate.hmw-consulting.de (HELO soleta.de.gnumonks.org) (pneira@us.es@83.236.178.202) by us.es with SMTP; 3 Apr 2012 11:51:40 +0200 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net Subject: [PATCH 3/3] netfilter: xt_CT: remove a compile warning Date: Tue, 3 Apr 2012 11:50:58 +0200 Message-Id: <1333446658-2335-4-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1333446658-2335-1-git-send-email-pablo@netfilter.org> References: <1333446658-2335-1-git-send-email-pablo@netfilter.org> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Pablo Neira Ayuso 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 Signed-off-by: Pablo Neira Ayuso --- 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: