[LV-kern-commit] CVS: kernel-2.4/drivers/net/arcnet Config.in,1.1.1.1,1.2 arc-rimi.c,1.1.1.2,1.2 arcnet.c,1.1.1.2,1.2 com20020-isa.c,1.1.1.2,1.2 com20020-pci.c,1.1.1.2,1.2 com20020.c,1.1.1.2,1.2 com90io.c,1.1.1.2,1.2 com90xx.c,1.1.1.2,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet
In directory usw-pr-cvs1:/tmp/cvs-serv30336/net/arcnet

Modified Files:
	Config.in arc-rimi.c arcnet.c com20020-isa.c com20020-pci.c 
	com20020.c com90io.c com90xx.c 
Log Message:
synch 2.4.15 commit 50


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/Config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Config.in	14 Jan 2001 17:40:02 -0000	1.1.1.1
+++ Config.in	11 Apr 2002 12:37:47 -0000	1.2
@@ -14,10 +14,8 @@
    dep_tristate 'ARCnet COM90xx (IO mapped) chipset driver' CONFIG_ARCNET_COM90xxIO $CONFIG_ARCNET
    dep_tristate 'ARCnet COM90xx (RIM I) chipset driver' CONFIG_ARCNET_RIM_I $CONFIG_ARCNET
    dep_tristate 'ARCnet COM20020 chipset driver' CONFIG_ARCNET_COM20020 $CONFIG_ARCNET
-   if [ "$CONFIG_ARCNET_COM20020" != "n" ]; then
-      dep_tristate '  Support for COM20020 on ISA' CONFIG_ARCNET_COM20020_ISA $CONFIG_ARCNET_COM20020 $CONFIG_ARCNET
-      dep_tristate '  Support for COM20020 on PCI' CONFIG_ARCNET_COM20020_PCI $CONFIG_ARCNET_COM20020 $CONFIG_ARCNET
-   fi
+   dep_tristate '  Support for COM20020 on ISA' CONFIG_ARCNET_COM20020_ISA $CONFIG_ARCNET_COM20020 $CONFIG_ISA
+   dep_tristate '  Support for COM20020 on PCI' CONFIG_ARCNET_COM20020_PCI $CONFIG_ARCNET_COM20020 $CONFIG_PCI
 fi
 
 endmenu

Index: arc-rimi.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/arc-rimi.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- arc-rimi.c	25 Feb 2001 23:15:00 -0000	1.1.1.2
+++ arc-rimi.c	11 Apr 2002 12:37:47 -0000	1.2
@@ -2,7 +2,7 @@
  * Linux ARCnet driver - "RIM I" (entirely mem-mapped) cards
  * 
  * Written 1994-1999 by Avery Pennarun.
- * Written 1999-2000 by Martin Mares <mj...@su...>.
+ * Written 1999-2000 by Martin Mares <mj...@uc...>.
  * Derived from skeleton.c by Donald Becker.
  *
  * Special thanks to Contemporary Controls, Inc. (www.ccontrols.com)

Index: arcnet.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/arcnet.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- arcnet.c	25 Feb 2001 23:15:00 -0000	1.1.1.2
+++ arcnet.c	11 Apr 2002 12:37:47 -0000	1.2
@@ -3,7 +3,7 @@
  * 
  * Written 1997 by David Woodhouse.
  * Written 1994-1999 by Avery Pennarun.
- * Written 1999-2000 by Martin Mares <mj...@su...>.
+ * Written 1999-2000 by Martin Mares <mj...@uc...>.
  * Derived from skeleton.c by Donald Becker.
  *
  * Special thanks to Contemporary Controls, Inc. (www.ccontrols.com)
@@ -107,7 +107,7 @@
 
 void __init arcnet_init(void)
 {
-	static int arcnet_inited = 0;
+	static int arcnet_inited;
 	int count;
 
 	if (arcnet_inited++)
@@ -361,8 +361,6 @@
 	dev->get_stats = arcnet_get_stats;
 	dev->hard_header = arcnet_header;
 	dev->rebuild_header = arcnet_rebuild_header;
-
-	dev_init_buffers(dev);
 }
 
 
@@ -528,7 +526,7 @@
 	struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
 	int status = 0;		/* default is failure */
 	unsigned short type;
-	uint8_t daddr;
+	uint8_t daddr=0;
 
 	if (skb->nh.raw - skb->mac.raw != 2) {
 		BUGMSG(D_NORMAL,
@@ -696,6 +694,9 @@
 		       msg, status, lp->intmask, lp->lasttrans_dest);
 		lp->last_timeout = jiffies;
 	}
+
+	if (lp->cur_tx == -1)
+		netif_wake_queue(dev);
 }
 
 

Index: com20020-isa.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/com20020-isa.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- com20020-isa.c	25 Feb 2001 23:15:00 -0000	1.1.1.2
+++ com20020-isa.c	11 Apr 2002 12:37:47 -0000	1.2
@@ -3,7 +3,7 @@
  * 
  * Written 1997 by David Woodhouse.
  * Written 1994-1999 by Avery Pennarun.
- * Written 1999-2000 by Martin Mares <mj...@su...>.
+ * Written 1999-2000 by Martin Mares <mj...@uc...>.
  * Derived from skeleton.c by Donald Becker.
  *
  * Special thanks to Contemporary Controls, Inc. (www.ccontrols.com)

Index: com20020-pci.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/com20020-pci.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- com20020-pci.c	25 Feb 2001 23:15:00 -0000	1.1.1.2
+++ com20020-pci.c	11 Apr 2002 12:37:47 -0000	1.2
@@ -3,7 +3,7 @@
  * 
  * Written 1994-1999 by Avery Pennarun,
  *    based on an ISA version by David Woodhouse.
- * Written 1999-2000 by Martin Mares <mj...@su...>.
+ * Written 1999-2000 by Martin Mares <mj...@uc...>.
  * Derived from skeleton.c by Donald Becker.
  *
  * Special thanks to Contemporary Controls, Inc. (www.ccontrols.com)
@@ -44,12 +44,12 @@
 
 /* Module parameters */
 
-static int node = 0;
+static int node;
 static char *device;		/* use eg. device="arc1" to change name */
 static int timeout = 3;
-static int backplane = 0;
-static int clockp = 0;
-static int clockm = 0;
+static int backplane;
+static int clockp;
+static int clockm;
 
 MODULE_PARM(node, "i");
 MODULE_PARM(device, "s");
@@ -78,10 +78,12 @@
 	if (!dev)
 		return err;
 	lp = dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
-	if (!lp)
-		return -ENOMEM;
+	if (!lp) {
+		err = -ENOMEM;
+		goto out_dev;
+	}
 	memset(lp, 0, sizeof(struct arcnet_local));
-	pdev->driver_data = dev;
+	pci_set_drvdata(pdev, dev);
 
 	ioaddr = pci_resource_start(pdev, 2);
 	dev->base_addr = ioaddr;
@@ -98,22 +100,35 @@
 	if (check_region(ioaddr, ARCNET_TOTAL_SIZE)) {
 		BUGMSG(D_INIT, "IO region %xh-%xh already allocated.\n",
 		       ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1);
-		return -EBUSY;
+		err = -EBUSY;
+		goto out_priv;
 	}
 	if (ASTATUS() == 0xFF) {
 		BUGMSG(D_NORMAL, "IO address %Xh was reported by PCI BIOS, "
 		       "but seems empty!\n", ioaddr);
-		return -EIO;
+		err = -EIO;
+		goto out_priv;
 	}
-	if (com20020_check(dev))
-		return -EIO;
+	if (com20020_check(dev)) {
+		err = -EIO;
+		goto out_priv;
+	}
+
+	if ((err = com20020_found(dev, SA_SHIRQ)) != 0)
+	        goto out_priv;
+
+	return 0;
 
-	return com20020_found(dev, SA_SHIRQ);
+out_priv:
+	kfree(dev->priv);
+out_dev:
+	kfree(dev);
+	return err;
 }
 
 static void __devexit com20020pci_remove(struct pci_dev *pdev)
 {
-	com20020_remove(pdev->driver_data);
+	com20020_remove(pci_get_drvdata(pdev));
 }
 
 static struct pci_device_id com20020pci_id_table[] __devinitdata = {

Index: com20020.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/com20020.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- com20020.c	25 Feb 2001 23:15:00 -0000	1.1.1.2
+++ com20020.c	11 Apr 2002 12:37:47 -0000	1.2
@@ -3,7 +3,7 @@
  * 
  * Written 1997 by David Woodhouse.
  * Written 1994-1999 by Avery Pennarun.
- * Written 1999 by Martin Mares <mj...@su...>.
+ * Written 1999 by Martin Mares <mj...@uc...>.
  * Derived from skeleton.c by Donald Becker.
  *
  * Special thanks to Contemporary Controls, Inc. (www.ccontrols.com)

Index: com90io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/com90io.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- com90io.c	25 Feb 2001 23:15:00 -0000	1.1.1.2
+++ com90io.c	11 Apr 2002 12:37:47 -0000	1.2
@@ -3,7 +3,7 @@
  * 
  * Written 1997 by David Woodhouse.
  * Written 1994-1999 by Avery Pennarun.
- * Written 1999-2000 by Martin Mares <mj...@su...>.
+ * Written 1999-2000 by Martin Mares <mj...@uc...>.
  * Derived from skeleton.c by Donald Becker.
  *
  * Special thanks to Contemporary Controls, Inc. (www.ccontrols.com)
@@ -373,8 +373,8 @@
 
 /* Module parameters */
 
-static int io = 0x0;		/* use the insmod io= irq= shmem= options */
-static int irq = 0;
+static int io;			/* use the insmod io= irq= shmem= options */
+static int irq;
 static char *device;		/* use eg. device=arc1 to change name */
 
 MODULE_PARM(io, "i");

Index: com90xx.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/arcnet/com90xx.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- com90xx.c	25 Feb 2001 23:15:00 -0000	1.1.1.2
+++ com90xx.c	11 Apr 2002 12:37:47 -0000	1.2
@@ -2,7 +2,7 @@
  * Linux ARCnet driver - COM90xx chipset (memory-mapped buffers)
  * 
  * Written 1994-1999 by Avery Pennarun.
- * Written 1999 by Martin Mares <mj...@su...>.
+ * Written 1999 by Martin Mares <mj...@uc...>.
  * Derived from skeleton.c by Donald Becker.
  *
  * Special thanks to Contemporary Controls, Inc. (www.ccontrols.com)
@@ -610,9 +610,9 @@
 
 /* Module parameters */
 
-static int io = 0x0;		/* use the insmod io= irq= shmem= options */
-static int irq = 0;
-static int shmem = 0;
+static int io;			/* use the insmod io= irq= shmem= options */
+static int irq;
+static int shmem;
 static char *device;		/* use eg. device=arc1 to change name */
 
 MODULE_PARM(io, "i");