diff options
| author | Rundong Ge <rdong.ge@gmail.com> | 2019-02-02 14:29:35 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-05-02 21:41:39 +0100 |
| commit | 17bbfb3a56bba622dd38ccdb60960f28ac13083f (patch) | |
| tree | 4fe438f91c0666f38268d2dbe8726b3a4677475f | |
| parent | 8931fadeb9f881932864d0a662698ea6adb9ad3f (diff) | |
net: dsa: slave: Don't propagate flag changes on down slave interfaces
commit 17ab4f61b8cd6f9c38e9d0b935d86d73b5d0d2b5 upstream.
The unbalance of master's promiscuity or allmulti will happen after ifdown
and ifup a slave interface which is in a bridge.
When we ifdown a slave interface , both the 'dsa_slave_close' and
'dsa_slave_change_rx_flags' will clear the master's flags. The flags
of master will be decrease twice.
In the other hand, if we ifup the slave interface again, since the
slave's flags were cleared the 'dsa_slave_open' won't set the master's
flag, only 'dsa_slave_change_rx_flags' that triggered by 'br_add_if'
will set the master's flags. The flags of master is increase once.
Only propagating flag changes when a slave interface is up makes
sure this does not happen. The 'vlan_dev_change_rx_flags' had the
same problem and was fixed, and changes here follows that fix.
Fixes: 91da11f870f0 ("net: Distributed Switch Architecture protocol support")
Signed-off-by: Rundong Ge <rdong.ge@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/dsa/slave.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 64c5af0a10dd..e77127861bf5 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -117,11 +117,14 @@ static void dsa_slave_change_rx_flags(struct net_device *dev, int change) { struct dsa_slave_priv *p = netdev_priv(dev); struct net_device *master = p->parent->dst->master_netdev; - - if (change & IFF_ALLMULTI) - dev_set_allmulti(master, dev->flags & IFF_ALLMULTI ? 1 : -1); - if (change & IFF_PROMISC) - dev_set_promiscuity(master, dev->flags & IFF_PROMISC ? 1 : -1); + if (dev->flags & IFF_UP) { + if (change & IFF_ALLMULTI) + dev_set_allmulti(master, + dev->flags & IFF_ALLMULTI ? 1 : -1); + if (change & IFF_PROMISC) + dev_set_promiscuity(master, + dev->flags & IFF_PROMISC ? 1 : -1); + } } static void dsa_slave_set_rx_mode(struct net_device *dev) |