diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2016-06-07 16:32:38 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-06-08 11:23:41 -0700 |
| commit | 0b7b498d41709d68bb4f520051f68d64f752beee (patch) | |
| tree | 1515ce106f957de150e6219ef71208febe9126e8 /net/dsa | |
| parent | net: sched: fix missing doc annotations (diff) | |
| download | linux-dev-0b7b498d41709d68bb4f520051f68d64f752beee.tar.xz linux-dev-0b7b498d41709d68bb4f520051f68d64f752beee.zip | |
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: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/slave.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 15a492261895..a51dfedf0014 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -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->read = dsa_slave_phy_read; 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->phy_mask = ~ds->phys_mii_mask; } |