lkml.org 
[lkml]   [2011]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v3 1/1] igmp: call ip_mc_clear_src() only when we have no users of ip_mc_list
From
Date
netdev-owner@vger.kernel.org wrote on 05/20/2011 09:27:09 AM:

> From: Veaceslav Falico <vfalico@redhat.com>

Looks ok to me:

Acked-by: David L Stevens <dlstevens@us.ibm.com>

>
> 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



\
 
 \ /
  Last update: 2011-05-23 19:43    [W:0.079 / U:0.808 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site