From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755581AbcBPQeG (ORCPT ); Tue, 16 Feb 2016 11:34:06 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:63706 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755465AbcBPQeC (ORCPT ); Tue, 16 Feb 2016 11:34:02 -0500 From: Arnd Bergmann To: Nikolay Borisov Cc: "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] net: igmp: use IS_ENABLED(CONFIG_IP_MULTICAST) instead of ifdef Date: Tue, 16 Feb 2016 17:33:18 +0100 Message-ID: <13046365.7R7s0XiHQi@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <56C34A0C.9040207@kyup.com> References: <1455638393-3269483-1-git-send-email-arnd@arndb.de> <56C34A0C.9040207@kyup.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:4t3oyF7k/HmACYo1t+zo+1rNetQucy//irUCvlgkJ+eivPMmRrE bNLiNbhsXfFvO0bM2udqephjfqFJkGWKE3MqpJImA6lttcOkkaJcskzLWn6T0Jl8zE9+EXu 2ORL5Gl5pvvYQbTJUMcQtNOIdMmYQ/vHEuN4IscoojLPD6HnGyqdJ4rNOih23u8t11HXIr8 tbcJIzYTz/F0+iZT+Eozg== X-UI-Out-Filterresults: notjunk:1;V01:K0:MfgYvUoFKZg=:Y/V5uwjW1PLQwQuwOzzV7A XfUx40sPDkgs0HUBhgLAVNgmdUYLoCdn6vDScwvV071vvPwPhHpywtG1TdQ10Nwp1kZh1a8Xj wwrxpAyQ2B2GQRxJBtLAK5cCpy+2R75nRJeRYpUZI9mzykmUOIPhPkM4ZpBp/L9in9IaWRRxZ EMjMBZDRhF+iXdNu2+Dvp5B5LZ+2pSA61gN5ARCtg23eaemfGNntUPdiTNv8NPJxUS02twB/9 wAz4yF0Kq1F4NQEZBlpp2ud2YBabucmN4OASYUf7pbcr5/Z+RpoQM49L5lX1PebtgFFSx4YMp VitaITfx0GKlAAZaGsJk+mWUnp2IkXtVpGP8BbsodEN/3qxd9uA0D9GfM3ILr9qYzRvDDRQGK M+qouUUlNrELUdldoYrIb0k02piajSQ11QHkiLJGy3Tc1sA7SMh+Lq+/oT3fvzPs3hjVic5gq pskDnty9mnKoIsrMgKYslWz9P0eiPLfi8dVEWoVj7QtAIPJr+p4IeS+4v9GXY11HHg0R7u/qQ yHaNjDxp86RVD/rwv5fbEkd/fVS3tK0RFyMWbaLY0ILLlaa7zNOMJkVvXYeEbn+Cyr3n22yx+ Lo8S/fqXk0HWpUaT2hi880icekgmI6aar4IBqy51KcTWfKV/o9yjpQxaGlkN2AH9XC5b29z0i Ix1iH218YmPnjxSHQPB7Sj8pLbUKEXA0+AMhPWxs42VSA80waAXgyvLzBlCBB2m0dBRnKi09z 0gfqpnwljHY5RQKC Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday 16 February 2016 18:10:52 Nikolay Borisov wrote: > On 02/16/2016 05:59 PM, Arnd Bergmann wrote: > > @@ -1821,17 +1807,15 @@ static int ip_mc_del_src(struct in_device *in_dev, __be32 *pmca, int sfmode, > > if (!err && rv < 0) > > err = rv; > > } > > - if (pmc->sfmode == MCAST_EXCLUDE && > > + if (IS_ENABLED(CONFIG_IP_MULTICAST) && > > + pmc->sfmode == MCAST_EXCLUDE && > > pmc->sfcount[MCAST_EXCLUDE] == 0 && > > pmc->sfcount[MCAST_INCLUDE]) { > > -#ifdef CONFIG_IP_MULTICAST > > struct ip_sf_list *psf; > > struct net *net = dev_net(in_dev->dev); > > -#endif > > > > /* filter mode change */ > > pmc->sfmode = MCAST_INCLUDE; > > The above line was always executed, whereas now it wouldn't execute > unless IS_ENABLED passes. This was not intentional, I've sent a v2 patch to fix it up now, and tried to simplify it a little further, making the logic the same for ip_mc_del_src and ip_mc_add_src. > > /* > > * Add multicast source filter list to the interface list > > @@ -1977,9 +1961,7 @@ static int ip_mc_add_src(struct in_device *in_dev, __be32 *pmca, int sfmode, > > spin_lock_bh(&pmc->lock); > > rcu_read_unlock(); > > > > -#ifdef CONFIG_IP_MULTICAST > > sf_markstate(pmc); > > -#endif > > This would be executed unconditionally, which is contrary to the > original intention. Dunno if it makes a difference though. This was intentional, I have changed sf_markstate() to do nothing when IP_MULTICAST is disabled. However, there was another caller where I should have done the same thing rather than adding an if(). > Reviewed-by: Nikolay Borisov Thanks! Arnd