Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756605Ab1EWRlr (ORCPT ); Mon, 23 May 2011 13:41:47 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:56240 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756057Ab1EWRlp (ORCPT ); Mon, 23 May 2011 13:41:45 -0400 In-Reply-To: <20110520162709.GA3497@darkmag.usersys.redhat.com> References: <20110515165945.GA20024@darkmag.usersys.redhat.com> <20110516.140359.111037536766782557.davem@davemloft.net> <20110517133801.GC30366@darkmag.usersys.redhat.com> <20110517143756.GE30366@darkmag.usersys.redhat.com> <20110520162709.GA3497@darkmag.usersys.redhat.com> To: Veaceslav Falico Cc: David Miller , jmorris@namei.org, kaber@trash.net, kuznet@ms2.inr.ac.ru, linux-kernel@vger.kernel.org, mmarek@suse.cz, netdev@vger.kernel.org, netdev-owner@vger.kernel.org, pekkas@netcore.fi, yoshfuji@linux-ipv6.org MIME-Version: 1.0 Subject: Re: [PATCH v3 1/1] igmp: call ip_mc_clear_src() only when we have no users of ip_mc_list X-KeepSent: 8F2A5C61:8060D0CC-88257899:00610B06; type=4; name=$KeepSent X-Mailer: Lotus Notes Release 8.5.1FP5 SHF29 November 12, 2010 From: David Stevens Message-ID: Date: Mon, 23 May 2011 10:41:03 -0700 X-MIMETrack: Serialize by Router on D03NM121/03/M/IBM(Release 8.5.1FP2|March 17, 2010) at 05/23/2011 11:41:03, Serialize complete at 05/23/2011 11:41:03 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2043 Lines: 69 netdev-owner@vger.kernel.org wrote on 05/20/2011 09:27:09 AM: > From: Veaceslav Falico Looks ok to me: Acked-by: David L Stevens > > So, does this patch seem ok? If yes, I'll send it with the changelog. > > --- > diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c > index 1fd3d9c..57ca93a 100644 > --- a/net/ipv4/igmp.c > +++ b/net/ipv4/igmp.c > @@ -1169,20 +1169,18 @@ static void igmp_group_dropped(struct ip_mc_list *im) > > if (!in_dev->dead) { > if (IGMP_V1_SEEN(in_dev)) > - goto done; > + return; > if (IGMP_V2_SEEN(in_dev)) { > if (reporter) > igmp_send_report(in_dev, im, IGMP_HOST_LEAVE_MESSAGE); > - goto done; > + return; > } > /* IGMPv3 */ > igmpv3_add_delrec(in_dev, im); > > igmp_ifc_event(in_dev); > } > -done: > #endif > - ip_mc_clear_src(im); > } > > static void igmp_group_added(struct ip_mc_list *im) > @@ -1319,6 +1317,7 @@ void ip_mc_dec_group(struct in_device *in_dev, > __be32 addr) > *ip = i->next_rcu; > in_dev->mc_count--; > igmp_group_dropped(i); > + ip_mc_clear_src(i); > > if (!in_dev->dead) > ip_rt_multicast_event(in_dev); > @@ -1428,7 +1427,8 @@ void ip_mc_destroy_dev(struct in_device *in_dev) > in_dev->mc_list = i->next_rcu; > in_dev->mc_count--; > > - igmp_group_dropped(i); > + /* We've dropped the groups in ip_mc_down already */ > + ip_mc_clear_src(i); > ip_ma_put(i); > } > } > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/