From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757291AbbJHMbi (ORCPT ); Thu, 8 Oct 2015 08:31:38 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:54014 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754146AbbJHMbg (ORCPT ); Thu, 8 Oct 2015 08:31:36 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: David Miller , pablo@netfilter.org, netdev@vger.kernel.org, fw@strlen.de, linux-kernel@vger.kernel.org, ebiederm@xmission.com Subject: Re: [PATCH] bridge/netfilter: avoid unused label warning Date: Thu, 08 Oct 2015 14:30:58 +0200 Message-ID: <6250097.aDMuaVNloH@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151008.044253.925506191056148131.davem@davemloft.net> References: <7985748.1v9Gzszd4T@wuerfel> <20151008.044253.925506191056148131.davem@davemloft.net> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:LGB3BgjgvbEN6tieVaozRXA4EmHvnB9UJAw/h/x7iZmQjiwu/we tyVgxxA2qE0pSvwW3BmmJYFmNVRLXPbmMS+3cwHvwSp4PLv0xrdnidP12nWDxxkxw9QqMxV vIXfOs0r3Y/WI2RNLtVnQHGn2Wxs27nOZkx/Qv9XtipH5r0gilkAMEC0A/aEM8cSQGAJZsj L9Nsb0o0qoIh/+MwLheSg== X-UI-Out-Filterresults: notjunk:1;V01:K0:H2nE6lE9fZ8=:v3rR7tGw+v0EyMxJTYm8Mr CzOeJY39/8YJaBv/hPxKBDSHK07yitwftnopSII9iFTjVcKmqQeHyttD2SuSNII+kbSwWecap nng2LpTFEl21fD0gkud/W02qUjIFPll9l+YraOp0ec7ogJTAUbvyvQknxxA+pGtBjtR+lEhSk ZoCPhQ/suYxDF/Jq9WlE4Krp2FlppWZxW8dmo+YlP5zPOC+sTBF9+cC816M78G2TB3T3VYoMV FyqE6GjvkoTOpyMwUTjz8PW94dHvJeSNwje0ewLkQMLM/C4qszupVwf//0n7A0Gz5ZKXkGOcG wc1lCUIB2tcrm8AtrbGrY0gKaXXWYJjy1eahwjKr98vKnLz0nNVXwnFyr3GyHqWkmXEIL7oY9 mof+3piehnYMDC+TnLx13F8QoKS0g9u+vd4sjXfcTXRajuf+ooHRG6pT3Ag4+BoZ9CboaAa8e hsBs+kcGxmtk6wMvQaVHAee/Wqk7bZN0QtOw/HXk83V+UKYHTFSNKatAc5kwdT6G+hRcbBXRs 5egFsllxaGySzv+Hn8WJ23EYBZMeuUcRlOrk92FI9OgebZvwTgYjOHRZZIu6pDMVCPNwDGANX BXtom/KWf66tRuiVglwzRVzMj/zUsmOm9mzpQZk5SaDZGlFZjmpQRhJDNrUB9hGEt2M9X4PNb dRQ5cWIrHj3Z28NEGAyS045TIJxdd5ABiMdZFOMWTpNjXmPpouymjoDRbrfvceh2FL2tYOhXF a26GYmHkraOTO/X7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 08 October 2015 04:42:53 David Miller wrote: > 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? Ok, done. Arnd