Commit e05c4ad3 authored Aug 23, 2011 by Yan, Zheng Committed by David S. Miller Aug 24, 2011

mcast: Fix source address selection for multicast listener report



Should check use count of include mode filter instead of total number
of include mode filters.

Signed-off-by: Zheng Yan <zheng.z.yan@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 814fd609

net/ipv4/igmp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -767,7 +767,7 @@ static int igmp_xmarksources(struct ip_mc_list pmc, int nsrcs, __be32 srcs)
		break;
		for (i=0; i<nsrcs; i++) {
		/* skip inactive filters */
		if (pmc->sfcount[MCAST_INCLUDE] \|\|
		if (psf->sf_count[MCAST_INCLUDE] \|\|
		pmc->sfcount[MCAST_EXCLUDE] !=
		psf->sf_count[MCAST_EXCLUDE])
		continue;

net/ipv6/mcast.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1059,7 +1059,7 @@ static int mld_xmarksources(struct ifmcaddr6 *pmc, int nsrcs,
		break;
		for (i=0; i<nsrcs; i++) {
		/* skip inactive filters */
		if (pmc->mca_sfcount[MCAST_INCLUDE] \|\|
		if (psf->sf_count[MCAST_INCLUDE] \|\|
		pmc->mca_sfcount[MCAST_EXCLUDE] !=
		psf->sf_count[MCAST_EXCLUDE])
		continue;