summaryrefslogtreecommitdiffstats
path: root/drivers/net/sgiseeq.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
commit230e5ab6a084ed50470f101934782dbf54b0d06b (patch)
tree5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/net/sgiseeq.c
parentc9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff)
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/sgiseeq.c')
-rw-r--r--drivers/net/sgiseeq.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 0ea951254..0602cb4ab 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -1,4 +1,4 @@
-/* $Id: sgiseeq.c,v 1.3 1997/09/16 14:44:21 marks Exp $
+/* $Id: sgiseeq.c,v 1.4 1997/12/06 04:11:41 ralf Exp $
* sgiseeq.c: Seeq8003 ethernet driver for SGI machines.
*
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
@@ -474,7 +474,7 @@ static int sgiseeq_close(struct device *dev)
/* Shutdown the Seeq. */
reset_hpc3_and_seeq(sp->hregs, sregs);
- free_irq(dev->irq, NULL);
+ free_irq(dev->irq, dev);
return 0;
}
@@ -515,17 +515,6 @@ static inline int verify_tx(struct sgiseeq_private *sp,
sgiseeq_reset(dev);
return 0;
}
- /* Is the skippy buf even reasonable? */
- if(skb == NULL) {
- dev_tint(dev);
- printk("%s: skb is NULL\n", dev->name);
- return -1;
- }
-
- if(skb->len <= 0) {
- printk("%s: skb len is %d\n", dev->name, skb->len);
- return -1;
- }
/* Are we getting in someone else's way? */
if(test_and_set_bit(0, (void *) &dev->tbusy) != 0) {
printk("%s: Transmitter access conflict.\n", dev->name);