Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751452AbVKAXsX (ORCPT ); Tue, 1 Nov 2005 18:48:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751451AbVKAXsX (ORCPT ); Tue, 1 Nov 2005 18:48:23 -0500 Received: from send.forptr.21cn.com ([202.105.45.52]:16026 "HELO 21cn.com") by vger.kernel.org with SMTP id S1751447AbVKAXsW (ORCPT ); Tue, 1 Nov 2005 18:48:22 -0500 Message-ID: <4367FF22.3030601@21cn.com> Date: Wed, 02 Nov 2005 07:49:54 +0800 From: Yan Zheng User-Agent: Mozilla Thunderbird 1.0.2-6 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: netdev@vger.kernel.org CC: linux-kernel@vger.kernel.org, David Stevens Subject: Re: [PATCH][MCAST]IPv6: small fix for ip6_mc_msfilter(...) References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-AIMC-AUTH: yanzheng X-AIMC-MAILFROM: yanzheng@21cn.com X-AIMC-Msg-ID: uG2tF7OB Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1756 Lines: 59 David Stevens wrote: > Yan, > Please also make this equivalent change in IPv4 with > ip_mc_msfilter() and ip_mc_add_src(). > > +-DLS > > Acked-by: David L Stevens To keep code style, I also create a new patch for IPv6. :-) Signed-off-by: Yan Zheng Patch for IPv4 Index:net/ipv4/igmp.c ============================================================ --- linux-2.6.14/net/ipv4/igmp.c 2005-10-28 08:02:08.000000000 +0800 +++ linux/net/ipv4/igmp.c 2005-11-02 07:31:01.000000000 +0800 @@ -1908,8 +1908,11 @@ int ip_mc_msfilter(struct sock *sk, stru sock_kfree_s(sk, newpsl, IP_SFLSIZE(newpsl->sl_max)); goto done; } - } else + } else { newpsl = NULL; + (void) ip_mc_add_src(in_dev, &msf->imsf_multiaddr, + msf->imsf_fmode, 0, NULL, 0) + } psl = pmc->sflist; if (psl) { (void) ip_mc_del_src(in_dev, &msf->imsf_multiaddr, pmc->sfmode, Patch for IPv6 Index:net/ipv6/mcast.c ============================================================ --- linux-2.6.14/net/ipv6/mcast.c 2005-10-30 23:09:33.000000000 +0800 +++ linux/net/ipv6/mcast.c 2005-11-02 07:19:12.000000000 +0800 @@ -545,8 +545,10 @@ int ip6_mc_msfilter(struct sock *sk, str sock_kfree_s(sk, newpsl, IP6_SFLSIZE(newpsl->sl_max)); goto done; } - } else + } else { newpsl = NULL; + (void) ip6_mc_add_src(idev, group, gsf->gf_fmode, 0, NULL, 0); + } psl = pmc->sflist; if (psl) { (void) ip6_mc_del_src(idev, group, pmc->sfmode, - 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/