diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2014-12-07 19:58:41 +0000 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2014-12-15 15:00:58 +0100 |
| commit | 9c71ac5fdb3f948b68995e5859b5cf1c6d8a13cb (patch) | |
| tree | 8bcbd3cbeb113a3e4a4df70303fb1cdf540284fd | |
| parent | 3e43a359e77d0349c8339358816f2bc6779f6d24 (diff) | |
| download | linux-2.6.32.y-drm33.z-9c71ac5fdb3f948b68995e5859b5cf1c6d8a13cb.tar.gz | |
vlan: Don't propagate flag changes on down interfaces.
commit deede2fabe24e00bd7e246eb81cd5767dc6fcfc7 upstream.
When (de)configuring a vlan interface, the IFF_ALLMULTI ans IFF_PROMISC
flags are cleared or set on the underlying interface. So, if these flags
are changed on a vlan interface that is not up, the flags underlying
interface might be set or cleared twice.
Only propagating flag changes when a device is up makes sure this does
not happen. It also makes sure that an underlying device is not set to
promiscuous or allmulti mode for a vlan device that is down.
Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: This is a dependency of commit d2615bf45069 ("net: core: Always
propagate flag changes to interfaces"), already backported in 2.6.32.62]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
| -rw-r--r-- | net/8021q/vlan_dev.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 9796ea4be4ec9..8c9f69c4dd225 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -639,10 +639,12 @@ static void vlan_dev_change_rx_flags(struct net_device *dev, int change) { struct net_device *real_dev = vlan_dev_info(dev)->real_dev; - if (change & IFF_ALLMULTI) - dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1); - if (change & IFF_PROMISC) - dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1); + if (dev->flags & IFF_UP) { + if (change & IFF_ALLMULTI) + dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1); + if (change & IFF_PROMISC) + dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1); + } } static void vlan_dev_set_rx_mode(struct net_device *vlan_dev) |