Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b7b498d authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: Provide unique DSA slave MII bus names 



In case we have multiples trees and switches with the same index, we
need to add another discriminating id: the switch tree.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 123b3652

net/dsa/slave.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,8 @@ void dsa_slave_mii_bus_init(struct dsa_switch *ds) 
	ds->slave_mii_bus->name = "dsa slave smi";

	ds->slave_mii_bus->name = "dsa slave smi";

	ds->slave_mii_bus->read = dsa_slave_phy_read;

	ds->slave_mii_bus->read = dsa_slave_phy_read;

	ds->slave_mii_bus->write = dsa_slave_phy_write;

	ds->slave_mii_bus->write = dsa_slave_phy_write;

	snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d", ds->index);

	snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d.%d",

		 ds->dst->tree, ds->index);

	ds->slave_mii_bus->parent = ds->dev;

	ds->slave_mii_bus->parent = ds->dev;

	ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask;

	ds->slave_mii_bus->phy_mask = ~ds->phys_mii_mask;

}

}