patch-2.1.19 linux/drivers/net/apricot.c

• Lines: 127
• Date: Tue Dec 31 10:29:59 1996
• Orig file: v2.1.18/linux/drivers/net/apricot.c
• Orig date: Fri Mar 1 07:50:42 1996

diff -u --recursive --new-file v2.1.18/linux/drivers/net/apricot.c linux/drivers/net/apricot.c
@@ -5,8 +5,8 @@
 	This driver is for the Apricot 82596 bus-master interface
 
         Modularised 12/94 Mark Evans
-    
-    Driver skeleton 
+
+    Driver skeleton
 	Written 1993 by Donald Becker.
 	Copyright 1993 United States Government as represented by the Director,
 	National Security Agency.  This software may only be used and distributed
@@ -15,7 +15,7 @@
 
 	The author may be reached as becker@super.org or
 	C/O Supercomputing Research Ctr., 17100 Science Dr., Bowie MD 20715
-    
+
 
 */
 
@@ -112,7 +112,7 @@
     unsigned short stat;
     unsigned short cmd;
     struct i596_rfd *next;
-    long rbd; 
+    long rbd;
     unsigned short count;
     unsigned short size;
     char data[1532];
@@ -177,7 +177,7 @@
 	0x00,	/* promiscuous mode */
 	0x00,	/* collision detect */
 	0x40,	/* minimum frame length */
-	0xff,	
+	0xff,
 	0x00,
 	0x7f	/*  *multi IA */ };
 
@@ -348,7 +348,7 @@
 		break;
 	    }
 
-  	    skb->dev = dev;		
+  	    skb->dev = dev;
 	    memcpy(skb_put(skb,pkt_len), lp->scb.rfd->data, pkt_len);
 
 	    skb->protocol=eth_type_trans(skb,dev);
@@ -496,7 +496,7 @@
     cli();
     if (lp->cmd_head != (struct i596_cmd *) I596_NULL)
 	lp->cmd_tail->next = cmd;
-    else 
+    else
     {
 	lp->cmd_head = cmd;
 	while (lp->scb.status, lp->scb.command)
@@ -517,7 +517,7 @@
     lp->cmd_head = lp->scb.cmd;
     restore_flags(flags);
 
-    if (lp->cmd_backlog > 16) 
+    if (lp->cmd_backlog > 16)
     {
 	int tickssofar = jiffies - lp->last_cmd;
 
@@ -682,7 +682,7 @@
     int checksum = 0;
     int ioaddr = 0x300;
     char eth_addr[6];
-    
+
     /* this is easy the ethernet interface can only be at 0x300 */
     /* first check nothing is already registered here */
 
@@ -703,7 +703,7 @@
 
     /* Some other boards trip the checksum.. but then appear as ether
        address 0. Trap these - AC */
-       
+
     if(memcmp(eth_addr,"\x00\x00\x49",3)!= 0)
     	return ENODEV;
 
@@ -953,7 +953,7 @@
 /*
  *	Set or clear the multicast filter for this adaptor.
  */
- 
+
 static void set_multicast_list(struct device *dev)
 {
 	struct i596_private *lp = (struct i596_private *)dev->priv;
@@ -962,7 +962,7 @@
 	if (i596_debug > 1)
 		printk ("%s: set multicast list %d\n", dev->name, dev->mc_count);
 
-	if (dev->mc_count > 0) 
+	if (dev->mc_count > 0)
 	{
 		struct dev_mc_list *dmi;
 		char *cp;
@@ -985,7 +985,7 @@
 	}
 	else
 	{
-		if (lp->set_conf.next != (struct i596_cmd * ) I596_NULL) 
+		if (lp->set_conf.next != (struct i596_cmd * ) I596_NULL)
 			return;
 		if (dev->mc_count == 0 && !(dev->flags&(IFF_PROMISC|IFF_ALLMULTI)))
 		{
@@ -1002,7 +1002,7 @@
 
 #ifdef HAVE_DEVLIST
 static unsigned int apricot_portlist[] = {0x300, 0};
-struct netdev_entry apricot_drv = 
+struct netdev_entry apricot_drv =
 {"apricot", apricot_probe, APRICOT_TOTAL_SIZE, apricot_portlist};
 #endif
 
@@ -1016,6 +1016,7 @@
 
 static int io = 0x300;
 static int irq = 10;
+MODULE_PARM(irq, "i");
 
 int
 init_module(void)