diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2011-08-23 22:54:37 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:53 -0700 |
| commit | 2ce655e2c1e821c6681bb0001c8a0add874647ec (patch) | |
| tree | 2ab68ce15fec2c419a312be6e69381caedc9531a /net | |
| parent | ea918c963323df0ad0d5052702b76c3230bf414d (diff) | |
| download | kernel_samsung_crespo-2ce655e2c1e821c6681bb0001c8a0add874647ec.zip kernel_samsung_crespo-2ce655e2c1e821c6681bb0001c8a0add874647ec.tar.gz kernel_samsung_crespo-2ce655e2c1e821c6681bb0001c8a0add874647ec.tar.bz2 | |
mcast: Fix source address selection for multicast listener report
[ 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/igmp.c | 2 | ||||
| -rw-r--r-- | net/ipv6/mcast.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 283c0a2..d577199 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -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; diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 3e6ebcd..ee7839f 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -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; |