| From foo@baz Wed Sep 21 12:45:10 CEST 2016 |
| From: Davide Caratti <dcaratti@redhat.com> |
| Date: Wed, 31 Aug 2016 14:16:44 +0200 |
| Subject: bridge: re-introduce 'fix parsing of MLDv2 reports' |
| |
| From: Davide Caratti <dcaratti@redhat.com> |
| |
| |
| [ Upstream commit 9264251ee2a55bce8fb93826b3f581fb9eb7e2c2 ] |
| |
| 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> |
| Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> |
| Acked-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/bridge/br_multicast.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/bridge/br_multicast.c |
| +++ b/net/bridge/br_multicast.c |
| @@ -1113,7 +1113,7 @@ static int br_ip6_multicast_mld2_report( |
| } else { |
| err = br_ip6_multicast_add_group(br, port, |
| &grec->grec_mca, vid); |
| - if (!err) |
| + if (err) |
| break; |
| } |
| } |
