diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2011-10-31 04:53:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-01 17:51:03 -0400 |
| commit | deede2fabe24e00bd7e246eb81cd5767dc6fcfc7 (patch) | |
| tree | dac4959510095dfabdcd5b04186e8c9050cf90ec | |
| parent | 045f7b3b0005bf30ad8d664c7651d816e2650cd2 (diff) | |
| download | linux-3.10-deede2fabe24e00bd7e246eb81cd5767dc6fcfc7.tar.gz linux-3.10-deede2fabe24e00bd7e246eb81cd5767dc6fcfc7.tar.bz2 linux-3.10-deede2fabe24e00bd7e246eb81cd5767dc6fcfc7.zip | |
vlan: Don't propagate flag changes on down interfaces.
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>
| -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 c8cf9391417..bc252862458 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -470,10 +470,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) |