From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756529AbbJHL1J (ORCPT ); Thu, 8 Oct 2015 07:27:09 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:60835 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751831AbbJHL1H (ORCPT ); Thu, 8 Oct 2015 07:27:07 -0400 Date: Thu, 08 Oct 2015 04:42:53 -0700 (PDT) Message-Id: <20151008.044253.925506191056148131.davem@davemloft.net> To: arnd@arndb.de Cc: netdev@vger.kernel.org, fw@strlen.de, pablo@netfilter.org, ebiederm@xmission.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] bridge/netfilter: avoid unused label warning From: David Miller In-Reply-To: <7985748.1v9Gzszd4T@wuerfel> References: <7985748.1v9Gzszd4T@wuerfel> X-Mailer: Mew version 6.4 on Emacs 23.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Thu, 08 Oct 2015 04:27:06 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann Date: Tue, 06 Oct 2015 21:22:12 +0200 > With the ARM mini2440_defconfig, the bridge netfilter code gets > built with both CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 > disabled, which leads to a harmless gcc warning: > > net/bridge/br_netfilter_hooks.c: In function 'br_nf_dev_queue_xmit': > net/bridge/br_netfilter_hooks.c:792:2: warning: label 'drop' defined but not used [-Wunused-label] > > This gets rid of the warning by cleaning up the code to avoid > the respective #ifdefs causing this problem, and replacing them > with if(IS_ENABLED()) checks. I have verified that the resulting > object code is unchanged, and an additional advantage is that > we now get compile coverage of the unused functions in more > configurations. > > Signed-off-by: Arnd Bergmann > Fixes: dd302b59bde0 ("netfilter: bridge: don't leak skb in error paths") This commit is in v4.2-rc3 and later, but this patch only applies to net-next as far as I can tell. Wouldn't it be better to base this on 'net', or even better Pablo's netfilter fixes tree, and while you are at it submit it properly to netfilter-devel with Pablo CC:'d as well? Thanks.