diff options
| author | Davide Caratti <dcaratti@redhat.com> | 2016-08-31 14:16:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-31 18:29:58 +0200 |
| commit | 9264251ee2a55bce8fb93826b3f581fb9eb7e2c2 (patch) | |
| tree | 1be66ce3c0e8045a5e46fc461a74af6da1a80c14 /net/bridge/br_multicast.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (diff) | |
| download | linux-9264251ee2a55bce8fb93826b3f581fb9eb7e2c2.tar.xz linux-9264251ee2a55bce8fb93826b3f581fb9eb7e2c2.zip | |
bridge: re-introduce 'fix parsing of MLDv2 reports'
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>
Diffstat (limited to 'net/bridge/br_multicast.c')
| -rw-r--r-- | net/bridge/br_multicast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index a5423a1eec05..c5fea9393946 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; } } |