patch-2.4.11-dontuse linux/drivers/net/wan/sealevel.c

• Lines: 69
• Date: Sun Sep 30 12:26:08 2001
• Orig file: v2.4.10/linux/drivers/net/wan/sealevel.c
• Orig date: Sun Sep 23 11:40:59 2001

diff -u --recursive --new-file v2.4.10/linux/drivers/net/wan/sealevel.c linux/drivers/net/wan/sealevel.c
@@ -1,5 +1,3 @@
-#define LINUX_21
-
 /*
  *	Sealevel Systems 4021 driver.
  *
@@ -8,8 +6,8 @@
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- *	(c) Copyright 1999 Building Number Three Ltd
- *	(c) Copyright 2001 Alan Cox.
+ *	(c) Copyright 1999, 2001 Alan Cox
+ *	(c) Copyright 2001 Red Hat Inc.
  *
  */
 
@@ -185,7 +183,6 @@
 	return z8530_queue_xmit(slvl->chan, skb);
 }
 
-#ifdef LINUX_21
 static int sealevel_neigh_setup(struct neighbour *n)
 {
 	if (n->nud_state == NUD_NONE) {
@@ -205,15 +202,6 @@
 	return 0;
 }
 
-#else
-
-static int return_0(struct net_device *d)
-{
-	return 0;
-}
-
-#endif
-
 /*
  *	Description block for a Comtrol Hostess SV11 card
  */
@@ -374,11 +362,7 @@
 			d->get_stats = sealevel_get_stats;
 			d->set_multicast_list = NULL;
 			d->do_ioctl = sealevel_ioctl;
-#ifdef LINUX_21			
 			d->neigh_setup = sealevel_neigh_setup_dev;
-#else
-			d->init = return_0;
-#endif
 			d->set_mac_address = NULL;
 		
 			if(register_netdev(d)==-1)
@@ -444,7 +428,6 @@
 static int irq=5;
 static int slow=0;
 
-#ifdef LINUX_21
 MODULE_PARM(io,"i");
 MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");
 MODULE_PARM(txdma,"i");
@@ -459,7 +442,6 @@
 MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Modular driver for the SeaLevel 4021");
-#endif
 
 static struct slvl_board *slvl_unit;