aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/declance.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/declance.c')
-rw-r--r--drivers/net/declance.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index d3d958e7ac56..bbccd741cdbf 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -1,4 +1,4 @@
1/* 1/*
2 * Lance ethernet driver for the MIPS processor based 2 * Lance ethernet driver for the MIPS processor based
3 * DECstation family 3 * DECstation family
4 * 4 *
@@ -42,7 +42,6 @@
42 * bits. macro 42 * bits. macro
43 */ 43 */
44 44
45#include <linux/config.h>
46#include <linux/crc32.h> 45#include <linux/crc32.h>
47#include <linux/delay.h> 46#include <linux/delay.h>
48#include <linux/errno.h> 47#include <linux/errno.h>
@@ -159,9 +158,9 @@ MODULE_LICENSE("GPL");
159 158
160/* The DS2000/3000 have a linear 64 KB buffer. 159/* The DS2000/3000 have a linear 64 KB buffer.
161 160
162 * The PMAD-AA has 128 kb buffer on-board. 161 * The PMAD-AA has 128 kb buffer on-board.
163 * 162 *
164 * The IOASIC LANCE devices use a shared memory region. This region as seen 163 * The IOASIC LANCE devices use a shared memory region. This region as seen
165 * from the CPU is (max) 128 KB long and has to be on an 128 KB boundary. 164 * from the CPU is (max) 128 KB long and has to be on an 128 KB boundary.
166 * The LANCE sees this as a 64 KB long continuous memory region. 165 * The LANCE sees this as a 64 KB long continuous memory region.
167 * 166 *
@@ -704,8 +703,8 @@ static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id,
704 return IRQ_HANDLED; 703 return IRQ_HANDLED;
705} 704}
706 705
707static irqreturn_t 706static irqreturn_t lance_interrupt(const int irq, void *dev_id,
708lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs) 707 struct pt_regs *regs)
709{ 708{
710 struct net_device *dev = (struct net_device *) dev_id; 709 struct net_device *dev = (struct net_device *) dev_id;
711 struct lance_private *lp = netdev_priv(dev); 710 struct lance_private *lp = netdev_priv(dev);
@@ -883,7 +882,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
883 skblen = skb->len; 882 skblen = skb->len;
884 883
885 len = skblen; 884 len = skblen;
886 885
887 if (len < ETH_ZLEN) { 886 if (len < ETH_ZLEN) {
888 if (skb_padto(skb, ETH_ZLEN)) 887 if (skb_padto(skb, ETH_ZLEN))
889 return 0; 888 return 0;
@@ -1254,7 +1253,7 @@ static int __init dec_lance_init(const int type, const int slot)
1254 return 0; 1253 return 0;
1255 1254
1256err_out_free_dev: 1255err_out_free_dev:
1257 kfree(dev); 1256 free_netdev(dev);
1258 1257
1259err_out: 1258err_out:
1260 return ret; 1259 return ret;
@@ -1300,6 +1299,7 @@ static void __exit dec_lance_cleanup(void)
1300 while (root_lance_dev) { 1299 while (root_lance_dev) {
1301 struct net_device *dev = root_lance_dev; 1300 struct net_device *dev = root_lance_dev;
1302 struct lance_private *lp = netdev_priv(dev); 1301 struct lance_private *lp = netdev_priv(dev);
1302
1303 unregister_netdev(dev); 1303 unregister_netdev(dev);
1304#ifdef CONFIG_TC 1304#ifdef CONFIG_TC
1305 if (lp->slot >= 0) 1305 if (lp->slot >= 0)