X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fnet%2Ftc35815.c;h=60f0265094876ec846dc74846a9889f17f487829;hb=6aa20a2235535605db6d6d2bd850298b2fe7f31e;hp=39460fa916fe9df45216b7315297b9fc9372e83c;hpb=7a291083225af6e22ffaa46b3d91cfc1a1ccaab4;p=deliverable%2Flinux.git diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 39460fa916fe..60f026509487 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -1,7 +1,7 @@ /* tc35815.c: A TOSHIBA TC35815CF PCI 10/100Mbps ethernet driver for linux. * * Copyright 2001 MontaVista Software Inc. - * Author: MontaVista Software, Inc. + * Author: MontaVista Software, Inc. * ahennessy@mvista.com * * Based on skelton.c by Donald Becker. @@ -663,7 +663,7 @@ tc35815_init_queues(struct net_device *dev) #endif } #ifdef __mips__ - fd_addr = (unsigned long)vtonocache(lp->fd_buf); + fd_addr = (unsigned long)vtonocache(lp->fd_buf); #else fd_addr = (unsigned long)lp->fd_buf; #endif @@ -1136,7 +1136,7 @@ tc35815_rx(struct net_device *dev) int cur_bd, offset; lp->stats.rx_bytes += pkt_len; - + skb = dev_alloc_skb(pkt_len + 2); /* +2: for reserve */ if (skb == NULL) { printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", @@ -1523,7 +1523,7 @@ static unsigned long tc_phy_read(struct net_device *dev, struct tc35815_regs *tr struct tc35815_local *lp = dev->priv; unsigned long data; unsigned long flags; - + spin_lock_irqsave(&lp->lock, flags); tc_writel(MD_CA_Busy | (phy << 5) | phy_reg, &tr->MD_CA);