Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

tc35815: Statistics cleanup

Browse Source 
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>
This commit is contained in:
Atsushi Nemoto 2008-04-13 00:11:46 +09:00 committed by Jeff Garzik
parent 703bb99ca7
commit 10e05f78c5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/tc35815.c
View File

@ -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);