From patchwork Tue Jan 17 11:04:46 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: 136449 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 50A44B6EFE for ; Tue, 17 Jan 2012 22:05:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753439Ab2AQLFN (ORCPT ); Tue, 17 Jan 2012 06:05:13 -0500 Received: from mail.us.es ([193.147.175.20]:32785 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753432Ab2AQLFK (ORCPT ); Tue, 17 Jan 2012 06:05:10 -0500 Received: (qmail 25223 invoked from network); 17 Jan 2012 12:04:59 +0100 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 17 Jan 2012 12:04:59 +0100 Received: (qmail 23539 invoked by uid 507); 17 Jan 2012 11:05:05 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-95.7 required=7.5 tests=BAYES_50,KHOP_DYNAMIC, RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL, RDNS_DYNAMIC,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.3/14316. Clear:RC:1(127.0.0.1):. Processed in 0.022919 secs); 17 Jan 2012 11:05:05 -0000 Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 17 Jan 2012 11:05:05 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/406/antivirus2); Tue, 17 Jan 2012 12:05:04 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/406/antivirus2) Received: (qmail 12619 invoked from network); 17 Jan 2012 12:04:51 +0100 Received: from 36.221.222.87.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@87.222.221.36) by us.es with SMTP; 17 Jan 2012 12:04:51 +0100 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 1/4] netfilter: xt_hashlimit: fix unused variable warning if IPv6 disabled Date: Tue, 17 Jan 2012 12:04:46 +0100 Message-Id: <1326798289-11592-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1326798289-11592-1-git-send-email-pablo@netfilter.org> References: <1326798289-11592-1-git-send-email-pablo@netfilter.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stephen Rothwell Fixes this warning when CONFIG_IP6_NF_IPTABLES is not enabled: net/netfilter/xt_hashlimit.c: In function ‘hashlimit_init_dst’: net/netfilter/xt_hashlimit.c:448:9: warning: unused variable ‘frag_off’ [-Wunused-variable] Signed-off-by: Stephen Rothwell Signed-off-by: Pablo Neira Ayuso --- net/netfilter/xt_hashlimit.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index 8e49921..d95f9c9 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c @@ -445,7 +445,6 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, { __be16 _ports[2], *ports; u8 nexthdr; - __be16 frag_off; int poff; memset(dst, 0, sizeof(*dst)); @@ -466,6 +465,9 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, break; #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES) case NFPROTO_IPV6: + { + __be16 frag_off; + if (hinfo->cfg.mode & XT_HASHLIMIT_HASH_DIP) { memcpy(&dst->ip6.dst, &ipv6_hdr(skb)->daddr, sizeof(dst->ip6.dst)); @@ -485,6 +487,7 @@ hashlimit_init_dst(const struct xt_hashlimit_htable *hinfo, if ((int)protoff < 0) return -1; break; + } #endif default: BUG();