From d85fb996509f366b01a61d16de4c444b8f9e07e3 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 21 Jan 2013 09:58:50 +0000 Subject: [PATCH] --- yaml --- r: 351543 b: refs/heads/master c: f490be049ba0a3b194bed3a0dfbdcab1ef0ae063 h: refs/heads/master i: 351541: 7d447627deaae466309f687a1c800f23950885d4 351539: f3c9d840e2088843ce14ed062495009cb6c1f2fb 351535: ae187a7ef6577b0cbff49f188d84be14b9fdcdb1 v: v3 --- [refs] | 2 +- trunk/net/dsa/slave.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7091970c3cb1..807269a361f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 441d9d327f1e770f5aa76fd91735851ac6e1e236 +refs/heads/master: f490be049ba0a3b194bed3a0dfbdcab1ef0ae063 diff --git a/trunk/net/dsa/slave.c b/trunk/net/dsa/slave.c index f4345582a6b9..6ebd8fbd9285 100644 --- a/trunk/net/dsa/slave.c +++ b/trunk/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; }