Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 30 Apr 2019 14:31:02 +0200
From:   Pablo Neira Ayuso <pablo@netfilter.org>
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>,
        Florian Westphal <fw@strlen.de>,
        "David S. Miller" <davem@davemloft.net>,
        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)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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 <arnd@arndb.de>
> ----
> 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.