netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports'
@ 2016-08-31 12:16 Davide Caratti
  2016-08-31 12:24 ` Nikolay Aleksandrov via Bridge
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Davide Caratti @ 2016-08-31 12:16 UTC (permalink / raw)
  To: David S. Miller
  Cc: Stephen Hemminger, Satish Ashok, Nikolay Aleksandrov,
	Thadeu Lima de Souza Cascardo, bridge, netdev

commit bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with
INCLUDE and no sources as a leave") seems to have accidentally reverted
commit 47cc84ce0c2f ("bridge: fix parsing of MLDv2 reports"). This
commit brings back a change to br_ip6_multicast_mld2_report() where
parsing of MLDv2 reports stops when the first group is successfully
added to the MDB cache.

Fixes: bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with INCLUDE and no sources as a leave")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
---
 net/bridge/br_multicast.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index a5423a1..c5fea93 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1138,7 +1138,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
 		} else {
 			err = br_ip6_multicast_add_group(br, port,
 							 &grec->grec_mca, vid);
-			if (!err)
+			if (err)
 				break;
 		}
 	}
-- 
2.5.5

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

* Re: [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports'
  2016-08-31 12:16 [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports' Davide Caratti
@ 2016-08-31 12:24 ` Nikolay Aleksandrov via Bridge
  2016-08-31 13:29 ` Thadeu Lima de Souza Cascardo
  2016-08-31 16:30 ` David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: Nikolay Aleksandrov via Bridge @ 2016-08-31 12:24 UTC (permalink / raw)
  To: Davide Caratti, David S. Miller
  Cc: bridge, Thadeu Lima de Souza Cascardo, netdev

On 31/08/16 14:16, Davide Caratti wrote:
> commit bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with
> INCLUDE and no sources as a leave") seems to have accidentally reverted
> commit 47cc84ce0c2f ("bridge: fix parsing of MLDv2 reports"). This
> commit brings back a change to br_ip6_multicast_mld2_report() where
> parsing of MLDv2 reports stops when the first group is successfully
> added to the MDB cache.
> 
> Fixes: bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with INCLUDE and no sources as a leave")
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
> ---
>  net/bridge/br_multicast.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index a5423a1..c5fea93 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -1138,7 +1138,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
>  		} else {
>  			err = br_ip6_multicast_add_group(br, port,
>  							 &grec->grec_mca, vid);
> -			if (!err)
> +			if (err)
>  				break;
>  		}
>  	}
> 

Indeed, good catch.

Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

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

* Re: [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports'
  2016-08-31 12:16 [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports' Davide Caratti
  2016-08-31 12:24 ` Nikolay Aleksandrov via Bridge
@ 2016-08-31 13:29 ` Thadeu Lima de Souza Cascardo
  2016-08-31 16:30 ` David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: Thadeu Lima de Souza Cascardo @ 2016-08-31 13:29 UTC (permalink / raw)
  To: Davide Caratti; +Cc: Nikolay Aleksandrov, netdev, bridge, David S. Miller

On Wed, Aug 31, 2016 at 02:16:44PM +0200, Davide Caratti wrote:
> commit bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with
> INCLUDE and no sources as a leave") seems to have accidentally reverted
> commit 47cc84ce0c2f ("bridge: fix parsing of MLDv2 reports"). This
> commit brings back a change to br_ip6_multicast_mld2_report() where
> parsing of MLDv2 reports stops when the first group is successfully
> added to the MDB cache.
> 
> Fixes: bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with INCLUDE and no sources as a leave")
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>
> ---
>  net/bridge/br_multicast.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index a5423a1..c5fea93 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -1138,7 +1138,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
>  		} else {
>  			err = br_ip6_multicast_add_group(br, port,
>  							 &grec->grec_mca, vid);
> -			if (!err)
> +			if (err)
>  				break;
>  		}
>  	}
> -- 
> 2.5.5
> 

Acked-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>

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

* Re: [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports'
  2016-08-31 12:16 [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports' Davide Caratti
  2016-08-31 12:24 ` Nikolay Aleksandrov via Bridge
  2016-08-31 13:29 ` Thadeu Lima de Souza Cascardo
@ 2016-08-31 16:30 ` David Miller
  2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2016-08-31 16:30 UTC (permalink / raw)
  To: dcaratti; +Cc: cascardo, nikolay, netdev, bridge

From: Davide Caratti <dcaratti@redhat.com>
Date: Wed, 31 Aug 2016 14:16:44 +0200

> commit bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with
> INCLUDE and no sources as a leave") seems to have accidentally reverted
> commit 47cc84ce0c2f ("bridge: fix parsing of MLDv2 reports"). This
> commit brings back a change to br_ip6_multicast_mld2_report() where
> parsing of MLDv2 reports stops when the first group is successfully
> added to the MDB cache.
> 
> Fixes: bc8c20acaea1 ("bridge: multicast: treat igmpv3 report with INCLUDE and no sources as a leave")
> Signed-off-by: Davide Caratti <dcaratti@redhat.com>

Applied and queued up for -stable, thanks.

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

end of thread, other threads:[~2016-08-31 16:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-31 12:16 [PATCH net] bridge: re-introduce 'fix parsing of MLDv2 reports' Davide Caratti
2016-08-31 12:24 ` Nikolay Aleksandrov via Bridge
2016-08-31 13:29 ` Thadeu Lima de Souza Cascardo
2016-08-31 16:30 ` David Miller

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