[3.11.y.z extended stable] Patch "macvlan: Don't propagate IFF_ALLMULTI changes on down interfaces." has been added to staging queue
Luis Henriques
luis.henriques at canonical.com
Tue Jun 3 10:27:43 UTC 2014
This is a note to let you know that I have just added a patch titled
macvlan: Don't propagate IFF_ALLMULTI changes on down interfaces.
to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
------
>From 31052733893f07bd141f89479c90ad23674a2b17 Mon Sep 17 00:00:00 2001
From: Peter Christensen <pch at ordbogen.com>
Date: Thu, 8 May 2014 11:15:37 +0200
Subject: macvlan: Don't propagate IFF_ALLMULTI changes on down interfaces.
commit bbeb0eadcf9fe74fb2b9b1a6fea82cd538b1e556 upstream.
Clearing the IFF_ALLMULTI flag on a down interface could cause an allmulti
overflow on the underlying interface.
Attempting the set IFF_ALLMULTI on the underlying interface would cause an
error and the log message:
"allmulti touches root, set allmulti failed."
Signed-off-by: Peter Christensen <pch at ordbogen.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/net/macvlan.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 9f7dd0ce4c70..e64fb8bc3e97 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -423,8 +423,10 @@ static void macvlan_change_rx_flags(struct net_device *dev, int change)
struct macvlan_dev *vlan = netdev_priv(dev);
struct net_device *lowerdev = vlan->lowerdev;
- if (change & IFF_ALLMULTI)
- dev_set_allmulti(lowerdev, dev->flags & IFF_ALLMULTI ? 1 : -1);
+ if (dev->flags & IFF_UP) {
+ if (change & IFF_ALLMULTI)
+ dev_set_allmulti(lowerdev, dev->flags & IFF_ALLMULTI ? 1 : -1);
+ }
}
static void macvlan_set_mac_lists(struct net_device *dev)
--
1.9.1
More information about the kernel-team
mailing list