Commit 06f8ec90 authored Sep 19, 2016 by John Crispin Committed by David S. Miller Sep 20, 2016

net-next: dsa: fix duplicate invocation of set_addr()



commit 83c0afae ("net: dsa: Add new binding implementation")
has a duplicate invocation of the set_addr() operation callback. Remove one
of them.

Signed-off-by: John Crispin <john@phrozen.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f361bdde

net/dsa/dsa2.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -308,10 +308,6 @@ static int dsa_ds_apply(struct dsa_switch_tree dst, struct dsa_switch ds)
		if (err < 0)
		return err;

		err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
		if (err < 0)
		return err;

		if (!ds->slave_mii_bus && ds->ops->phy_read) {
		ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
		if (!ds->slave_mii_bus)