diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-04-13 00:11:46 +0900 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:31:31 -0400 |
| commit | 10e05f78c5566cb762ced12bf70307c60168d56e (patch) | |
| tree | 2e2454cff75a2644e0bf079da5e72f10a7b42e0c /drivers | |
| parent | 703bb99ca73aa38d3f200d4c7e9bb460dce35fda (diff) | |
| download | linux-stable-10e05f78c5566cb762ced12bf70307c60168d56e.tar.gz linux-stable-10e05f78c5566cb762ced12bf70307c60168d56e.tar.bz2 linux-stable-10e05f78c5566cb762ced12bf70307c60168d56e.zip | |
tc35815: Statistics cleanup
On Sat, 12 Apr 2008 05:00:49 -0400, Jeff Garzik <jeff@garzik.org> wrote:
> applied 1-6
Thanks.
Could you apply this too, or hopufully fold into Andy Fleming's "phy:
Change mii_bus id field to a string" patch (commit c69fedae) ?
------------------------------------------------------
Subject: [PATCH] tc35815: build fix
Fix build failure caused by Andy Fleming's "phy: Change mii_bus id
field to a string" patch.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tc35815.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 744f11f5ffb8..10e4e85da3fc 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -766,7 +766,8 @@ static int tc_mii_init(struct net_device *dev) lp->mii_bus.name = "tc35815_mii_bus"; lp->mii_bus.read = tc_mdio_read; lp->mii_bus.write = tc_mdio_write; - lp->mii_bus.id = (lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn; + snprintf(lp->mii_bus.id, MII_BUS_ID_SIZE, "%x", + (lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn); lp->mii_bus.priv = dev; lp->mii_bus.dev = &lp->pci_dev->dev; lp->mii_bus.irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL); |