diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-21 15:40:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-21 15:40:47 -0500 |
| commit | 100204147be9a2b87be2b118959b12eeaf8ef5d0 (patch) | |
| tree | 774573c6a730967410a51e954577424be0977fe6 /net/dsa/slave.c | |
| parent | 441d9d327f1e770f5aa76fd91735851ac6e1e236 (diff) | |
| parent | f9bf5a2ca6cc331f32e3dd9cf16ced7215d0e6e8 (diff) | |
Merge branch 'dsa'
Florian Fainelli says:
====================
These two patches are non-critical bugfixes based on net-next which I
stumbled upon while working on Device Tree bindings for DSA (will comme
as a separate patch later).
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index f4345582a6b..6ebd8fbd928 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -41,8 +41,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, "%s:%.2x", - ds->master_mii_bus->id, ds->pd->sw_addr); + snprintf(ds->slave_mii_bus->id, MII_BUS_ID_SIZE, "dsa-%d:%.2x", + ds->index, ds->pd->sw_addr); ds->slave_mii_bus->parent = &ds->master_mii_bus->dev; } |