From 96013f2b69107cc6b540a6d710ea2ac39141aa3c Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 9 Jan 2012 23:59:12 +0000 Subject: [PATCH] --- yaml --- r: 284289 b: refs/heads/master c: 63f678301fb952c2d758d9ded4ed88c1da6c0c50 h: refs/heads/master i: 284287: 9585608ae40598dd4a4a5d3f9be7a6103cdd25b9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/dnet.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 73cb501bf0c3..ba7f295eba5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98d5e57eafce7a68d864fdb5a26542ba8b4f59ba +refs/heads/master: 63f678301fb952c2d758d9ded4ed88c1da6c0c50 diff --git a/trunk/drivers/net/ethernet/dnet.c b/trunk/drivers/net/ethernet/dnet.c index ce88c0f399f6..925c9bafc9b9 100644 --- a/trunk/drivers/net/ethernet/dnet.c +++ b/trunk/drivers/net/ethernet/dnet.c @@ -325,7 +325,8 @@ static int dnet_mii_init(struct dnet *bp) bp->mii_bus->write = &dnet_mdio_write; bp->mii_bus->reset = &dnet_mdio_reset; - snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%x", 0); + snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", + bp->pdev->name, bp->pdev->id); bp->mii_bus->priv = bp;