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

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

diff -u --recursive --new-file v2.4.10/linux/drivers/net/wan/hostess_sv11.c linux/drivers/net/wan/hostess_sv11.c
@@ -1,5 +1,3 @@
-#define LINUX_21
-
 /*
  *	Comtrol SV11 card driver
  *
@@ -186,7 +184,6 @@
 	return z8530_queue_xmit(&sv11->sync.chanA, skb);
 }
 
-#ifdef LINUX_21
 static int hostess_neigh_setup(struct neighbour *n)
 {
 	if (n->nud_state == NUD_NONE) {
@@ -206,15 +203,6 @@
 	return 0;
 }
 
-#else
-
-static int return_0(struct net_device *d)
-{
-	return 0;
-}
-
-#endif
-
 /*
  *	Description block for a Comtrol Hostess SV11 card
  */
@@ -345,11 +333,7 @@
 		d->get_stats = hostess_get_stats;
 		d->set_multicast_list = NULL;
 		d->do_ioctl = hostess_ioctl;
-#ifdef LINUX_21			
 		d->neigh_setup = hostess_neigh_setup_dev;
-#else
-		d->init = return_0;
-#endif
 		d->set_mac_address = NULL;
 		
 		if(register_netdev(d)==-1)
@@ -416,7 +400,7 @@
 int init_module(void)
 {
 	printk(KERN_INFO "SV-11 Z85230 Synchronous Driver v 0.02.\n");
-	printk(KERN_INFO "(c) Copyright 1998, Building Number Three Ltd.\n");	
+	printk(KERN_INFO "(c) Copyright 2001, Red Hat Inc.\n");	
 	if((sv11_unit=sv11_init(io,irq))==NULL)
 		return -ENODEV;
 	return 0;