Skip to contentSkip to conversation

mcast: Fix source address selection for multicast listener report

PATCH Applied Yan, Zheng 2 participants 2 messages Aug 24, 2011 – Aug 25, 2011

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

Yan, Zheng

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

net/ipv4/igmp.c +1 -1
index 283c0a2..d577199 100644
@@ -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
index 3e6ebcd..ee7839f 100644
@@ -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;