From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_NEOMUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E82C8C43219 for ; Tue, 30 Apr 2019 12:31:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B924D2080C for ; Tue, 30 Apr 2019 12:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727739AbfD3MbI (ORCPT ); Tue, 30 Apr 2019 08:31:08 -0400 Received: from mail.us.es ([193.147.175.20]:49736 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726123AbfD3MbH (ORCPT ); Tue, 30 Apr 2019 08:31:07 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id B5D7711FF8F for ; Tue, 30 Apr 2019 14:31:05 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id A36DBDA718 for ; Tue, 30 Apr 2019 14:31:05 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 9E59DDA715; Tue, 30 Apr 2019 14:31:05 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 8D924DA707; Tue, 30 Apr 2019 14:31:03 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Tue, 30 Apr 2019 14:31:03 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from us.es (129.166.216.87.static.jazztel.es [87.216.166.129]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: 1984lsi) by entrada.int (Postfix) with ESMTPSA id 546204265A31; Tue, 30 Apr 2019 14:31:03 +0200 (CEST) Date: Tue, 30 Apr 2019 14:31:02 +0200 X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: Arnd Bergmann Cc: Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] netfilter: nat: avoid unused-variable warning Message-ID: <20190430123102.xia5kwlkqsvinqvi@salvia> References: <20190325135336.2107801-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190325135336.2107801-1-arnd@arndb.de> User-Agent: NeoMutt/20170113 (1.7.2) X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Mon, Mar 25, 2019 at 02:53:05PM +0100, Arnd Bergmann wrote: > masq_refcnt6 was added at the start of the file, but it is > only used in the option IPv6 section of the file, causing > a harmless compiler warning if IPv6 is disabled: > > net/netfilter/nf_nat_masquerade.c:15:21: error: 'masq_refcnt6' defined but not used [-Werror=unused-variable] > static unsigned int masq_refcnt6 __read_mostly; > > Move the variable next to the user to avoid that warning. > > Fixes: 46f7487e161b ("netfilter: nat: don't register device notifier twice") > Signed-off-by: Arnd Bergmann > ---- > This is an older patch stack, for some reason I seem to have never > sent it, and I can't find any indication of anyone else sending > a similar fix, so sending this out now. > > If it's already fixed upstream, please ignore. Yes, Florian fixed this in nf-next.