[PATCH] mcast: Fix source address selection for multicast listener report.

Subsystems: networking [general], networking [ipv4/ipv6], the rest

STALE5534d

2 messages, 1 author, 2011-08-24 · open the first message on its own page

[PATCH] mcast: Fix source address selection for multicast listener report.

From: Yan, Zheng <hidden>
Date: 2011-08-24 07:55:11

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

Signed-off-by: Zheng Yan  <redacted>
---
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;

Re: [PATCH] mcast: Fix source address selection for multicast listener report.

From: Yan, Zheng <hidden>
Date: 2011-08-24 08:47:14

On Wed, Aug 24, 2011 at 3:55 PM, Yan, Zheng [off-list ref] wrote:
quoted hunk
Should check use count of include mode filter instead of total number
of include mode filters.

Signed-off-by: Zheng Yan  <redacted>
---
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;
Sorry. this one is malformed, please ignore it.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help