| Message ID | 1320072793-16490-1-git-send-email-matthijs@stdin.nl |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Matthijs Kooijman <matthijs@stdin.nl> Date: Mon, 31 Oct 2011 15:53:13 +0100 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 9d40a07..0e72689 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)
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> --- net/8021q/vlan_dev.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)