diff options
author | Peter Christensen <pch@ordbogen.com> | 2014-05-08 11:15:37 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-06-09 13:28:59 +0100 |
commit | 5b64df7dd898e1b05ecb77d06a69313a9d7c43db (patch) | |
tree | 5f265d2c542db01c0f0792e00e6d39b5c161cee5 /drivers/net | |
parent | 2157fbf160aa15f1f97fdb14261a3b1d3796b0fb (diff) |
macvlan: Don't propagate IFF_ALLMULTI changes on down interfaces.
[ Upstream commit bbeb0eadcf9fe74fb2b9b1a6fea82cd538b1e556 ]
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@ordbogen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/macvlan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index ab5786b49d5f..b74cdf6a0d7d 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -391,8 +391,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_multicast_list(struct net_device *dev) |