diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-05-27 15:20:04 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-05-27 15:20:04 +0000 |
commit | b810acd44b7b458ae62a3cbf4cf418a7db78e1e7 (patch) | |
tree | cf3968b0e9505da05b0a8bde94188bf5215706fa /target/linux/generic/patches-3.18/051-01-bridge-fix-parsing-of-MLDv2-reports.patch | |
parent | 0c4d4b2013da0d5f997f78a911f5c3466f6dcf1a (diff) | |
download | upstream-b810acd44b7b458ae62a3cbf4cf418a7db78e1e7.tar.gz upstream-b810acd44b7b458ae62a3cbf4cf418a7db78e1e7.tar.bz2 upstream-b810acd44b7b458ae62a3cbf4cf418a7db78e1e7.zip |
kernel: bridge: backport two snooping related patches
With this patch the following two patches are backported:
* bridge: fix parsing of MLDv2 reports
* bridge: allow setting hash_max + multicast_router if interface is down
The former one is an important fix which got just applied to the net-tree
and is queued for stable. The latter is a patch which is needed to make
the hash_max and multicast_router attributes configurable through
netifd.
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45783 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/051-01-bridge-fix-parsing-of-MLDv2-reports.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/051-01-bridge-fix-parsing-of-MLDv2-reports.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/051-01-bridge-fix-parsing-of-MLDv2-reports.patch b/target/linux/generic/patches-3.18/051-01-bridge-fix-parsing-of-MLDv2-reports.patch new file mode 100644 index 0000000000..9fdaf17596 --- /dev/null +++ b/target/linux/generic/patches-3.18/051-01-bridge-fix-parsing-of-MLDv2-reports.patch @@ -0,0 +1,58 @@ +From 1430a5975e1a5f249875faab7fd35b915a8d2397 Mon Sep 17 00:00:00 2001 +From: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> +Date: Fri, 22 May 2015 12:18:59 -0300 +Subject: [PATCH] bridge: fix parsing of MLDv2 reports + +When more than a multicast address is present in a MLDv2 report, all but +the first address is ignored, because the code breaks out of the loop if +there has not been an error adding that address. + +This has caused failures when two guests connected through the bridge +tried to communicate using IPv6. Neighbor discoveries would not be +transmitted to the other guest when both used a link-local address and a +static address. + +This only happens when there is a MLDv2 querier in the network. + +The fix will only break out of the loop when there is a failure adding a +multicast address. + +The mdb before the patch: + +dev ovirtmgmt port vnet0 grp ff02::1:ff7d:6603 temp +dev ovirtmgmt port vnet1 grp ff02::1:ff7d:6604 temp +dev ovirtmgmt port bond0.86 grp ff02::2 temp + +After the patch: + +dev ovirtmgmt port vnet0 grp ff02::1:ff7d:6603 temp +dev ovirtmgmt port vnet1 grp ff02::1:ff7d:6604 temp +dev ovirtmgmt port bond0.86 grp ff02::fb temp +dev ovirtmgmt port bond0.86 grp ff02::2 temp +dev ovirtmgmt port bond0.86 grp ff02::d temp +dev ovirtmgmt port vnet0 grp ff02::1:ff00:76 temp +dev ovirtmgmt port bond0.86 grp ff02::16 temp +dev ovirtmgmt port vnet1 grp ff02::1:ff00:77 temp +dev ovirtmgmt port bond0.86 grp ff02::1:ff00:def temp +dev ovirtmgmt port bond0.86 grp ff02::1:ffa1:40bf temp + +Fixes: 08b202b67264 ("bridge br_multicast: IPv6 MLD support.") +Reported-by: Rik Theys <Rik.Theys@esat.kuleuven.be> +Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com> +Tested-by: Rik Theys <Rik.Theys@esat.kuleuven.be> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + 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 +@@ -1071,7 +1071,7 @@ static int br_ip6_multicast_mld2_report( + + err = br_ip6_multicast_add_group(br, port, &grec->grec_mca, + vid); +- if (!err) ++ if (err) + break; + } + |