Commit 6457edfe authored Sep 22, 2017 by Vivien Didelot Committed by David S. Miller Sep 25, 2017

net: dsa: make slave close symmetrical to open



The DSA slave open function configures the unicast MAC addresses on the
master device, enable the switch port, change its STP state, then start
the PHY device.

Make the close function symmetric, by first stopping the PHY device,
then changing the STP state, disabling the switch port and restore the
master device.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6450f8f2

net/dsa/slave.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -133,6 +133,11 @@ static int dsa_slave_close(struct net_device *dev)
		if (p->phy)
		phy_stop(p->phy);

		dsa_port_set_state_now(p->dp, BR_STATE_DISABLED);

		if (ds->ops->port_disable)
		ds->ops->port_disable(ds, p->dp->index, p->phy);

		dev_mc_unsync(master, dev);
		dev_uc_unsync(master, dev);
		if (dev->flags & IFF_ALLMULTI)
		@@ -143,11 +148,6 @@ static int dsa_slave_close(struct net_device *dev)
		if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
		dev_uc_del(master, dev->dev_addr);

		if (ds->ops->port_disable)
		ds->ops->port_disable(ds, p->dp->index, p->phy);

		dsa_port_set_state_now(p->dp, BR_STATE_DISABLED);

		return 0;
		}

Admin message