mirror of
https://github.com/hak5/wifipineapple-openwrt.git
synced 2025-10-29 16:57:19 +00:00
CC: kernel: update 3.18 to 3.18.17
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17 Backport of r46150. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46155 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,58 +0,0 @@
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,6 @@ V2: Drop useless "default n", thanks Sergei :)
|
||||
drivers/usb/host/Kconfig | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
|
||||
index 197a6a3..688698a 100644
|
||||
--- a/drivers/usb/host/Kconfig
|
||||
+++ b/drivers/usb/host/Kconfig
|
||||
@@ -32,7 +32,14 @@ config USB_XHCI_PCI
|
||||
@@ -41,6 +39,3 @@ index 197a6a3..688698a 100644
|
||||
|
||||
config USB_XHCI_MVEBU
|
||||
tristate "xHCI support for Marvell Armada 375/38x"
|
||||
--
|
||||
1.8.4.5
|
||||
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
if (qdisc == NULL) {
|
||||
--- a/net/sched/sch_api.c
|
||||
+++ b/net/sched/sch_api.c
|
||||
@@ -1945,7 +1945,7 @@ static int __init pktsched_init(void)
|
||||
@@ -1947,7 +1947,7 @@ static int __init pktsched_init(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user