netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mcast: Fix source address selection for multicast listener report.
@ 2011-08-24  7:55 Yan, Zheng 
  2011-08-24  8:47 ` Yan, Zheng 
  0 siblings, 1 reply; 4+ messages in thread
From: Yan, Zheng  @ 2011-08-24  7:55 UTC (permalink / raw)
  To: netdev; +Cc: dlstevens, davem

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>
---
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;

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] mcast: Fix source address selection for multicast listener report.
  2011-08-24  7:55 Yan, Zheng 
@ 2011-08-24  8:47 ` Yan, Zheng 
  0 siblings, 0 replies; 4+ messages in thread
From: Yan, Zheng  @ 2011-08-24  8:47 UTC (permalink / raw)
  To: netdev; +Cc: dlstevens, davem

On Wed, Aug 24, 2011 at 3:55 PM, Yan, Zheng <yanzheng@21cn.com> wrote:
> 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>
> ---
> 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] mcast: Fix source address selection for multicast listener report
@ 2011-08-24  8:54 Yan, Zheng
  2011-08-25  0:46 ` David Miller
  0 siblings, 1 reply; 4+ messages in thread
From: Yan, Zheng @ 2011-08-24  8:54 UTC (permalink / raw)
  To: netdev; +Cc: davem, dlstevens

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>

---
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;

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] mcast: Fix source address selection for multicast listener report
  2011-08-24  8:54 [PATCH] mcast: Fix source address selection for multicast listener report Yan, Zheng
@ 2011-08-25  0:46 ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2011-08-25  0:46 UTC (permalink / raw)
  To: zheng.z.yan; +Cc: netdev, dlstevens

From: "Yan, Zheng" <zheng.z.yan@intel.com>
Date: Wed, 24 Aug 2011 16:54:37 +0800

> 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>

Applied, thank you.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-08-25  0:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-24  8:54 [PATCH] mcast: Fix source address selection for multicast listener report Yan, Zheng
2011-08-25  0:46 ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2011-08-24  7:55 Yan, Zheng 
2011-08-24  8:47 ` Yan, Zheng 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).