aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tc35815.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tc35815.c')
-rw-r--r--drivers/net/tc35815.c8
1 files changed, 4 insertions, 4 deletions
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 @@
1/* tc35815.c: A TOSHIBA TC35815CF PCI 10/100Mbps ethernet driver for linux. 1/* tc35815.c: A TOSHIBA TC35815CF PCI 10/100Mbps ethernet driver for linux.
2 * 2 *
3 * Copyright 2001 MontaVista Software Inc. 3 * Copyright 2001 MontaVista Software Inc.
4 * Author: MontaVista Software, Inc. 4 * Author: MontaVista Software, Inc.
5 * ahennessy@mvista.com 5 * ahennessy@mvista.com
6 * 6 *
7 * Based on skelton.c by Donald Becker. 7 * Based on skelton.c by Donald Becker.
@@ -663,7 +663,7 @@ tc35815_init_queues(struct net_device *dev)
663#endif 663#endif
664 } 664 }
665#ifdef __mips__ 665#ifdef __mips__
666 fd_addr = (unsigned long)vtonocache(lp->fd_buf); 666 fd_addr = (unsigned long)vtonocache(lp->fd_buf);
667#else 667#else
668 fd_addr = (unsigned long)lp->fd_buf; 668 fd_addr = (unsigned long)lp->fd_buf;
669#endif 669#endif
@@ -1136,7 +1136,7 @@ tc35815_rx(struct net_device *dev)
1136 int cur_bd, offset; 1136 int cur_bd, offset;
1137 1137
1138 lp->stats.rx_bytes += pkt_len; 1138 lp->stats.rx_bytes += pkt_len;
1139 1139
1140 skb = dev_alloc_skb(pkt_len + 2); /* +2: for reserve */ 1140 skb = dev_alloc_skb(pkt_len + 2); /* +2: for reserve */
1141 if (skb == NULL) { 1141 if (skb == NULL) {
1142 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", 1142 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
1523 struct tc35815_local *lp = dev->priv; 1523 struct tc35815_local *lp = dev->priv;
1524 unsigned long data; 1524 unsigned long data;
1525 unsigned long flags; 1525 unsigned long flags;
1526 1526
1527 spin_lock_irqsave(&lp->lock, flags); 1527 spin_lock_irqsave(&lp->lock, flags);
1528 1528
1529 tc_writel(MD_CA_Busy | (phy << 5) | phy_reg, &tr->MD_CA); 1529 tc_writel(MD_CA_Busy | (phy << 5) | phy_reg, &tr->MD_CA);