DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mcast: Fix source address selection for multicast listener report

Browse Source 
[ Upstream commit e05c4ad3ed874ee4f5e2c969e55d318ec654332c ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Yan, Zheng
2011-08-23 22:54:37 +00:00
committed by Greg Kroah-Hartman
parent ea918c9633
commit 2ce655e2c1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/igmp.c
View File

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

2
net/ipv6/mcast.c
View File

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