From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH 1/6] tc35815: Statistics cleanup Date: Wed, 16 Apr 2008 20:54:11 -0400 Message-ID: <48069FB3.1070404@garzik.org> References: <20080411.002412.03977557.anemo@mba.ocn.ne.jp> <48007A41.2000803@garzik.org> <20080413.001146.25909265.anemo@mba.ocn.ne.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Andy Fleming , linux-mips@linux-mips.org, netdev@vger.kernel.org To: Atsushi Nemoto Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:57516 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752315AbYDQAyU (ORCPT ); Wed, 16 Apr 2008 20:54:20 -0400 In-Reply-To: <20080413.001146.25909265.anemo@mba.ocn.ne.jp> Sender: netdev-owner@vger.kernel.org List-ID: Atsushi Nemoto wrote: > On Sat, 12 Apr 2008 05:00:49 -0400, Jeff Garzik 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 > --- > diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c > index 744f11f..10e4e85 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); applied