net: dsa: Handle non-bridge master change

Master change notifications may occur other than when joining or
leaving a bridge, for example when being added to or removed from
a bond or Open vSwitch. In that case, do nothing instead of asking
the switch driver to remove a port from a bridge that it didn't join.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index f0af7aa331c1951d054fe1de5a95bd1bcee4ff46..39555f3f263bd98a7f2f5919738309d67aebb7a4 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -830,12 +830,13 @@ static bool dsa_slave_dev_check(struct net_device *dev)
 static int dsa_slave_master_changed(struct net_device *dev)
 {
        struct net_device *master = netdev_master_upper_dev_get(dev);
+       struct dsa_slave_priv *p = netdev_priv(dev);
        int err = 0;
 
        if (master && master->rtnl_link_ops &&
            !strcmp(master->rtnl_link_ops->kind, "bridge"))
                err = dsa_slave_bridge_port_join(dev, master);
-       else
+       else if (dsa_port_is_bridged(p))
                err = dsa_slave_bridge_port_leave(dev);
 
        return err;