aboutsummaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-09-19 09:28:00 -0400
committerDavid S. Miller <davem@davemloft.net>2016-09-20 04:47:44 -0400
commit06f8ec9041f02d44bb0b75d47668e2fe00d5e0c3 (patch)
treeaabb919be408ee2c254d03df196272b918dc752b /net/dsa
parentf361bdde6124339aab599e45471c6aa79125d1a2 (diff)
net-next: dsa: fix duplicate invocation of set_addr()
commit 83c0afaec7b730b ("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>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/dsa2.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 8278385dcd21..cffc19e972a1 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -308,10 +308,6 @@ static int dsa_ds_apply(struct dsa_switch_tree *dst, struct dsa_switch *ds)
308 if (err < 0) 308 if (err < 0)
309 return err; 309 return err;
310 310
311 err = ds->ops->set_addr(ds, dst->master_netdev->dev_addr);
312 if (err < 0)
313 return err;
314
315 if (!ds->slave_mii_bus && ds->ops->phy_read) { 311 if (!ds->slave_mii_bus && ds->ops->phy_read) {
316 ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev); 312 ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);
317 if (!ds->slave_mii_bus) 313 if (!ds->slave_mii_bus)