patch-2.2.16 linux/drivers/net/82596.c

Next file: linux/drivers/net/Config.in
Previous file: linux/drivers/net/3c59x.c
Back to the patch index
Back to the overall index

diff -urN v2.2.15/linux/drivers/net/82596.c linux/drivers/net/82596.c
@@ -11,10 +11,15 @@
    by Richard Hirst <richard@sleepie.demon.co.uk>
    Renamed to be 82596.c
 
-   *** Untested on Apricot hardware, and may require some hacking
-   *** to make it work.  The old 82596.c reported hasn't worked
-   *** since 1.3.xx anyway.  I have been unable to find any users
-   *** of Apricot hardware to test this on.
+   980825:  Changed to receive directly in to sk_buffs which are
+   allocated at open() time.  Eliminates copy on incoming frames
+   (small ones are still copied).  Shared data now held in a
+   non-cached page, so we can run on 68060 in copyback mode.
+
+   TBD:
+   * look at deferring rx frames rather than discarding (as per tulip)
+   * handle tx ring full as per tulip
+   * performance test to tune rx_copybreak
 
    Most of my modifications relate to the braindead big-endian
    implementation by Intel.  When the i596 is operating in
@@ -35,7 +40,7 @@
 
  */
 
-static const char *version = "82596.c:v1.0 15/07/98\n";
+static const char *version = "82596.c $Revision: 1.2 $\n";
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -57,12 +62,47 @@
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
-#include <asm/pgtable.h>	/*?? */
+#include <asm/pgtable.h>
 
-#ifdef CONFIG_MVME16x_NET
+/* DEBUG flags
+ */
+
+#define DEB_INIT	0x0001
+#define DEB_PROBE	0x0002
+#define DEB_SERIOUS	0x0004
+#define DEB_ERRORS	0x0008
+#define DEB_MULTI	0x0010
+#define DEB_TDR		0x0020
+#define DEB_OPEN	0x0040
+#define DEB_RESET	0x0080
+#define DEB_ADDCMD	0x0100
+#define DEB_STATUS	0x0200
+#define DEB_STARTTX	0x0400
+#define DEB_RXADDR	0x0800
+#define DEB_TXADDR	0x1000
+#define DEB_RXFRAME	0x2000
+#define DEB_INTS	0x4000
+#define DEB_STRUCT	0x8000
+#define DEB_ANY		0xffff
+
+
+#define DEB(x,y)	if (i596_debug & (x)) y
+
+
+#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_MVME16x_NET_MODULE)
+#define ENABLE_MVME16x_NET
+#endif
+#if defined(CONFIG_BVME6000_NET) || defined(CONFIG_BVME6000_NET_MODULE)
+#define ENABLE_BVME6000_NET
+#endif
+#if defined(CONFIG_APRICOT) || defined(CONFIG_APRICOT_MODULE)
+#define ENABLE_APRICOT
+#endif
+
+#ifdef ENABLE_MVME16x_NET
 #include <asm/mvme16xhw.h>
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 #include <asm/bvme6000hw.h>
 #endif
 
@@ -82,12 +122,13 @@
 #define ISCP_BUSY	0x00010000
 #define MACH_IS_APRICOT	0
 #else
-#define WSWAPrfd(x)	x
-#define WSWAPiscp(x)	((struct i596_iscp *)(x))
-#define WSWAPscb(x)	((struct i596_scb *)(x))
-#define WSWAPcmd(x)	x
-#define WSWAPtbd(x)	x
-#define WSWAPchar(x)	x
+#define WSWAPrfd(x)     ((struct i596_rfd *)(x))
+#define WSWAPrbd(x)     ((struct i596_rbd *)(x))
+#define WSWAPiscp(x)    ((struct i596_iscp *)(x))
+#define WSWAPscb(x)     ((struct i596_scb *)(x))
+#define WSWAPcmd(x)     ((struct i596_cmd *)(x))
+#define WSWAPtbd(x)     ((struct i596_tbd *)(x))
+#define WSWAPchar(x)    ((char *)(x))
 #define ISCP_BUSY	0x0001
 #define MACH_IS_APRICOT	1
 #endif
@@ -103,27 +144,24 @@
 #define PORT_ALTSCP		0x02	/* alternate SCB address */
 #define PORT_ALTDUMP		0x03	/* Alternate DUMP address */
 
-#ifndef HAVE_PORTRESERVE
-#define check_region(addr, size)	0
-#define request_region(addr, size,name)	do ; while(0)
-#endif
+static int i596_debug = (DEB_SERIOUS|DEB_PROBE);
 
-#ifndef HAVE_ALLOC_SKB
-#define alloc_skb(size, priority) (struct sk_buff *) kmalloc(size,priority)
-#define kfree_skbmem(buff, size) kfree_s(buff,size)
-#endif
+MODULE_AUTHOR("Richard Hirst");
+MODULE_DESCRIPTION("i82596 driver");
+MODULE_PARM(i596_debug, "i");
 
-#define APRICOT_DEBUG 2
 
-#ifdef APRICOT_DEBUG
-int i596_debug = APRICOT_DEBUG;
-#else
-int i596_debug = 1;
-#endif
+/* Copy frames shorter than rx_copybreak, otherwise pass on up in
+ * a full sized sk_buff.  Value of 100 stolen from tulip.c (!alpha).
+ */
+static int rx_copybreak = 100;
+
+#define PKT_BUF_SZ	1536
+#define MAX_MC_CNT	64
 
 #define I596_TOTAL_SIZE 17
 
-#define I596_NULL -1
+#define I596_NULL ((void *)0xffffffff)
 
 #define CMD_EOL		0x8000	/* The last command of the list, stop. */
 #define CMD_SUSP	0x4000	/* Suspend after doing cmd. */
@@ -156,12 +194,6 @@
 	unsigned long ca;
 };
 
-struct i596_cmd {
-	unsigned short status;
-	unsigned short command;
-	struct i596_cmd *next;
-};
-
 #define EOF		0x8000
 #define SIZE_MASK	0x3fff
 
@@ -172,6 +204,23 @@
 	char *data;
 };
 
+/* The command structure has two 'next' pointers; v_next is the address of
+ * the next command as seen by the CPU, b_next is the address of the next
+ * command as seen by the 82596.  The b_next pointer, as used by the 82596
+ * always references the status field of the next command, rather than the
+ * v_next field, because the 82596 is unaware of v_next.  It may seem more
+ * logical to put v_next at the end of the structure, but we cannot do that
+ * because the 82596 expects other fields to be there, depending on command
+ * type.
+ */
+
+struct i596_cmd {
+	struct i596_cmd *v_next;	/* Address from CPUs viewpoint */
+	unsigned short status;
+	unsigned short command;
+	struct i596_cmd *b_next;	/* Address from i596 viewpoint */
+};
+
 struct tx_cmd {
 	struct i596_cmd cmd;
 	struct i596_tbd *tbd;
@@ -180,16 +229,53 @@
 	struct sk_buff *skb;	/* So we can free it after tx */
 };
 
+struct tdr_cmd {
+	struct i596_cmd cmd;
+	unsigned short status;
+	unsigned short pad;
+};
+
+struct mc_cmd {
+	struct i596_cmd cmd;
+	short mc_cnt;
+	char mc_addrs[MAX_MC_CNT*6];
+};
+
+struct sa_cmd {
+	struct i596_cmd cmd;
+	char eth_addr[8];
+};
+
+struct cf_cmd {
+	struct i596_cmd cmd;
+	char i596_config[16];
+};
+
 struct i596_rfd {
 	unsigned short stat;
 	unsigned short cmd;
-	struct i596_rfd *next;
-	long rbd;
+	struct i596_rfd *b_next;	/* Address from i596 viewpoint */
+	struct i596_rbd *rbd;
 	unsigned short count;
 	unsigned short size;
-	char data[1532];
+	struct i596_rfd *v_next;	/* Address from CPUs viewpoint */
+	struct i596_rfd *v_prev;
+};
+
+struct i596_rbd {
+    unsigned short count;
+    unsigned short zero1;
+    struct i596_rbd *b_next;
+    unsigned char *b_data;		/* Address from i596 viewpoint */
+    unsigned short size;
+    unsigned short zero2;
+    struct sk_buff *skb;
+    struct i596_rbd *v_next;
+    struct i596_rbd *b_addr;		/* This rbd addr from i596 view */
+    unsigned char *v_data;		/* Address from CPUs viewpoint */
 };
 
+#define TX_RING_SIZE 64
 #define RX_RING_SIZE 16
 
 struct i596_scb {
@@ -222,19 +308,24 @@
 	volatile struct i596_scp scp;
 	volatile struct i596_iscp iscp;
 	volatile struct i596_scb scb;
-	struct i596_cmd set_add;
-	char eth_addr[8];
-	struct i596_cmd set_conf;
-	char i596_config[16];
-	struct i596_cmd tdr;
+	struct sa_cmd sa_cmd;
+	struct cf_cmd cf_cmd;
+	struct tdr_cmd tdr_cmd;
+	struct mc_cmd mc_cmd;
 	unsigned long stat;
 	int last_restart __attribute__((aligned(4)));
-	struct i596_rfd *rx_tail;
+	struct i596_rfd *rfd_head;
+	struct i596_rbd *rbd_head;
 	struct i596_cmd *cmd_tail;
 	struct i596_cmd *cmd_head;
 	int cmd_backlog;
 	unsigned long last_cmd;
 	struct net_device_stats stats;
+	struct i596_rfd rfds[RX_RING_SIZE];
+	struct i596_rbd rbds[RX_RING_SIZE];
+	struct tx_cmd tx_cmds[TX_RING_SIZE];
+	struct i596_tbd tbds[TX_RING_SIZE];
+	int next_tx_cmd;
 };
 
 char init_setup[] =
@@ -264,26 +355,29 @@
 static int i596_close(struct device *dev);
 static struct net_device_stats *i596_get_stats(struct device *dev);
 static void i596_add_cmd(struct device *dev, struct i596_cmd *cmd);
-static void print_eth(char *);
+static void print_eth(unsigned char *buf, char *str);
 static void set_multicast_list(struct device *dev);
 
+static int rx_ring_size = RX_RING_SIZE;
 static int ticks_limit = 25;
-static int max_cmd_backlog = 16;
+static int max_cmd_backlog = TX_RING_SIZE-1;
 
 
 static inline void CA(struct device *dev)
 {
-#ifdef CONFIG_MVME16x_NET
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
 		((struct i596_reg *) dev->base_addr)->ca = 1;
 	}
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
-		volatile u32 i = *(volatile u32 *) (dev->base_addr);
+		volatile u32 i;
+
+		i = *(volatile u32 *) (dev->base_addr);
 	}
 #endif
-#ifdef CONFIG_APRICOT
+#ifdef ENABLE_APRICOT
 	if (MACH_IS_APRICOT) {
 		outw(0, (short) (dev->base_addr) + 4);
 	}
@@ -293,14 +387,14 @@
 
 static inline void MPU_PORT(struct device *dev, int c, volatile void *x)
 {
-#ifdef CONFIG_MVME16x_NET
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
 		struct i596_reg *p = (struct i596_reg *) (dev->base_addr);
 		p->porthi = ((c) | (u32) (x)) & 0xffff;
 		p->portlo = ((c) | (u32) (x)) >> 16;
 	}
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
 		u32 v = (u32) (c) | (u32) (x);
 		v = ((u32) (v) << 16) | ((u32) (v) >> 16);
@@ -312,103 +406,203 @@
 }
 
 
-#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET)
-static void i596_error(int irq, void *dev_id, struct pt_regs *regs)
+static inline int wait_istat(struct device *dev, struct i596_private *lp, int delcnt, char *str)
 {
-	struct device *dev = dev_id;
-	struct i596_cmd *cmd;
+	while (--delcnt && lp->iscp.stat)
+		udelay(10);
+	if (!delcnt) {
+		printk("%s: %s, status %4.4x, cmd %4.4x.\n",
+		     dev->name, str, lp->scb.status, lp->scb.command);
+		return -1;
+	}
+	else
+		return 0;
+}
 
-	struct i596_private *lp = (struct i596_private *) dev->priv;
-	printk("i596_error: lp = 0x%08x\n", (u32) lp);
-	printk("scp at %08x, .sysbus = %08x, .iscp = %08x\n",
-	       (u32) & lp->scp, (u32) lp->scp.sysbus, (u32) lp->scp.iscp);
-	printk("iscp at %08x, .stat = %08x, .scb = %08x\n",
-	       (u32) & lp->iscp, (u32) lp->iscp.stat, (u32) lp->iscp.scb);
-	printk("scb at %08x, .status = %04x, .command = %04x\n",
-	       (u32) & lp->scb, lp->scb.status, lp->scb.command);
-	printk("   .cmd = %08x, .rfd = %08x\n", (u32) lp->scb.cmd,
-	       (u32) lp->scb.rfd);
-	cmd = WSWAPcmd(lp->scb.cmd);
-	while (cmd && (u32) cmd < 0x1000000) {
-		printk("cmd at %08x, .status = %04x, .command = %04x, .next = %08x\n",
-		  (u32) cmd, cmd->status, cmd->command, (u32) cmd->next);
-		cmd = WSWAPcmd(cmd->next);
+
+static inline int wait_cmd(struct device *dev, struct i596_private *lp, int delcnt, char *str)
+{
+	while (--delcnt && lp->scb.command)
+		udelay(10);
+	if (!delcnt) {
+		printk("%s: %s, status %4.4x, cmd %4.4x.\n",
+		     dev->name, str, lp->scb.status, lp->scb.command);
+		return -1;
 	}
-	while (1);
+	else
+		return 0;
 }
-#endif
 
-static inline int init_rx_bufs(struct device *dev, int num)
+
+static void i596_display_data(struct device *dev)
 {
 	struct i596_private *lp = (struct i596_private *) dev->priv;
-	int i;
+	struct i596_cmd *cmd;
 	struct i596_rfd *rfd;
+	struct i596_rbd *rbd;
+
+	printk("lp and scp at %p, .sysbus = %08lx, .iscp = %p\n",
+	       &lp->scp, lp->scp.sysbus, lp->scp.iscp);
+	printk("iscp at %p, iscp.stat = %08lx, .scb = %p\n",
+	       &lp->iscp, lp->iscp.stat, lp->iscp.scb);
+	printk("scb at %p, scb.status = %04x, .command = %04x,"
+		" .cmd = %p, .rfd = %p\n",
+	       &lp->scb, lp->scb.status, lp->scb.command,
+		lp->scb.cmd, lp->scb.rfd);
+	printk("   errors: crc %lx, align %lx, resource %lx,"
+               " over %lx, rcvdt %lx, short %lx\n",
+		lp->scb.crc_err, lp->scb.align_err, lp->scb.resource_err,
+		lp->scb.over_err, lp->scb.rcvdt_err, lp->scb.short_err);
+	cmd = lp->cmd_head;
+	while (cmd != I596_NULL) {
+		printk("cmd at %p, .status = %04x, .command = %04x, .b_next = %p\n",
+		  cmd, cmd->status, cmd->command, cmd->b_next);
+		cmd = cmd->v_next;
+	}
+	rfd = lp->rfd_head;
+	printk("rfd_head = %p\n", rfd);
+	do {
+		printk ("   %p .stat %04x, .cmd %04x, b_next %p, rbd %p,"
+                        " count %04x\n",
+			rfd, rfd->stat, rfd->cmd, rfd->b_next, rfd->rbd,
+			rfd->count);
+		rfd = rfd->v_next;
+	} while (rfd != lp->rfd_head);
+	rbd = lp->rbd_head;
+	printk("rbd_head = %p\n", rbd);
+	do {
+		printk("   %p .count %04x, b_next %p, b_data %p, size %04x\n",
+			rbd, rbd->count, rbd->b_next, rbd->b_data, rbd->size);
+		rbd = rbd->v_next;
+	} while (rbd != lp->rbd_head);
+}
 
-	lp->scb.rfd = (struct i596_rfd *) I596_NULL;
 
-	if (i596_debug > 1)
-		printk("%s: init_rx_bufs %d.\n", dev->name, num);
+#if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET)
+static void i596_error(int irq, void *dev_id, struct pt_regs *regs)
+{
+	struct device *dev = dev_id;
+	volatile unsigned char *pcc2 = (unsigned char *) 0xfff42000;
 
-	for (i = 0; i < num; i++) {
-		if (!(rfd = (struct i596_rfd *) kmalloc(sizeof(struct i596_rfd), GFP_KERNEL)))
-			 break;
+	pcc2[0x28] = 1;
+	pcc2[0x2b] = 0x1d;
+	printk("%s: Error interrupt\n", dev->name);
+	i596_display_data(dev);
+}
+#endif
 
-		rfd->stat = 0x0000;
-		rfd->rbd = I596_NULL;
-		rfd->count = 0;
-		rfd->size = 1532;
-		if (i == 0) {
-			rfd->cmd = CMD_EOL;
-			lp->rx_tail = rfd;
-		} else
-			rfd->cmd = 0x0000;
+static inline void init_rx_bufs(struct device *dev)
+{
+	struct i596_private *lp = (struct i596_private *)dev->priv;
+	int i;
+	struct i596_rfd *rfd;
+	struct i596_rbd *rbd;
+
+	/* First build the Receive Buffer Descriptor List */
+
+	for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
+		struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
 
-		rfd->next = lp->scb.rfd;
-		lp->scb.rfd = WSWAPrfd(rfd);
+		if (skb == NULL)
+			panic("82596: alloc_skb() failed");
+		skb->dev = dev;
+		rbd->v_next = rbd+1;
+		rbd->b_next = WSWAPrbd(virt_to_bus(rbd+1));
+		rbd->b_addr = WSWAPrbd(virt_to_bus(rbd));
+		rbd->skb = skb;
+		rbd->v_data = skb->tail;
+		rbd->b_data = WSWAPchar(virt_to_bus(skb->tail));
+		rbd->size = PKT_BUF_SZ;
+#ifdef __mc68000__
+		cache_clear(virt_to_phys(skb->tail), PKT_BUF_SZ);
+#endif
 	}
+	lp->rbd_head = lp->rbds;
+	rbd = lp->rbds + rx_ring_size - 1;
+	rbd->v_next = lp->rbds;
+	rbd->b_next = WSWAPrbd(virt_to_bus(lp->rbds));
 
-	if (i != 0)
-		lp->rx_tail->next = lp->scb.rfd;
+	/* Now build the Receive Frame Descriptor List */
 
-	return (i);
+	for (i = 0, rfd = lp->rfds; i < rx_ring_size; i++, rfd++) {
+		rfd->rbd = I596_NULL;
+		rfd->v_next = rfd+1;
+		rfd->v_prev = rfd-1;
+		rfd->b_next = WSWAPrfd(virt_to_bus(rfd+1));
+		rfd->cmd = CMD_FLEX;
+	}
+	lp->rfd_head = lp->rfds;
+	lp->scb.rfd = WSWAPrfd(virt_to_bus(lp->rfds));
+	rfd = lp->rfds;
+	rfd->rbd = lp->rbd_head;
+	rfd->v_prev = lp->rfds + rx_ring_size - 1;
+	rfd = lp->rfds + rx_ring_size - 1;
+	rfd->v_next = lp->rfds;
+	rfd->b_next = WSWAPrfd(virt_to_bus(lp->rfds));
+	rfd->cmd = CMD_EOL|CMD_FLEX;
 }
 
 static inline void remove_rx_bufs(struct device *dev)
 {
+	struct i596_private *lp = (struct i596_private *)dev->priv;
+	struct i596_rbd *rbd;
+	int i;
+
+	for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
+		if (rbd->skb == NULL)
+			break;
+		dev_kfree_skb(rbd->skb);
+	}
+}
+
+
+static void rebuild_rx_bufs(struct device *dev)
+{
 	struct i596_private *lp = (struct i596_private *) dev->priv;
-	struct i596_rfd *rfd = WSWAPrfd(lp->scb.rfd);
+	int i;
 
-	lp->rx_tail->next = (struct i596_rfd *) I596_NULL;
+	/* Ensure rx frame/buffer descriptors are tidy */
 
-	do {
-		lp->scb.rfd = rfd->next;
-		kfree(rfd);
-		rfd = WSWAPrfd(lp->scb.rfd);
-	}
-	while (rfd != lp->rx_tail);
+	for (i = 0; i < rx_ring_size; i++) {
+		lp->rfds[i].rbd = I596_NULL;
+		lp->rfds[i].cmd = CMD_FLEX;
+	}
+	lp->rfds[rx_ring_size-1].cmd = CMD_EOL|CMD_FLEX;
+	lp->rfd_head = lp->rfds;
+	lp->scb.rfd = WSWAPrfd(virt_to_bus(lp->rfds));
+	lp->rbd_head = lp->rbds;
+	lp->rfds[0].rbd = WSWAPrbd(virt_to_bus(lp->rbds));
 }
 
-static inline void init_i596_mem(struct device *dev)
+
+static int init_i596_mem(struct device *dev)
 {
 	struct i596_private *lp = (struct i596_private *) dev->priv;
-#if !defined(CONFIG_MVME16x_NET) && !defined(CONFIG_BVME6000_NET)
+#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET)
 	short ioaddr = dev->base_addr;
 #endif
-	int boguscnt = 100000;
 	unsigned long flags;
 
-#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET)
-#ifdef CONFIG_MVME16x_NET
+	MPU_PORT(dev, PORT_RESET, 0);
+
+	udelay(100);		/* Wait 100us - seems to help */
+
+#if defined(ENABLE_MVME16x_NET) || defined(ENABLE_BVME6000_NET)
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
 		volatile unsigned char *pcc2 = (unsigned char *) 0xfff42000;
 
 		/* Disable all ints for now */
 		pcc2[0x28] = 1;
-		pcc2[0x2a] = 0x40;
-		pcc2[0x2b] = 0x40;	/* Set snooping bits now! */
+		pcc2[0x2a] = 0x48;
+		/* Following disables snooping.  Snooping is not required
+		 * as we make appropriate use of non-cached pages for
+		 * shared data, and cache_push/cache_clear.
+		 */
+		pcc2[0x2b] = 0x08;
 	}
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
 		volatile unsigned char *ethirq = (unsigned char *) BVME_ETHIRQ_REG;
 
@@ -416,74 +610,72 @@
 	}
 #endif
 
-	MPU_PORT(dev, PORT_RESET, 0);
-
-	udelay(100);		/* Wait 100us - seems to help */
-
 	/* change the scp address */
 
-	MPU_PORT(dev, PORT_ALTSCP, &lp->scp);
+	MPU_PORT(dev, PORT_ALTSCP, (void *)virt_to_bus(&lp->scp));
 
-#else
+#elif defined(ENABLE_APRICOT)
 
-	/* change the scp address */
-	outw(0, ioaddr);
-	outw(0, ioaddr);
-	outb(4, ioaddr + 0xf);
-	outw(((((int) &lp->scp) & 0xffff) | 2), ioaddr);
-	outw((((int) &lp->scp) >> 16) & 0xffff, ioaddr);
+	{
+		u32 scp = virt_to_bus(&lp->scp);
+
+		/* change the scp address */
+		outw(0, ioaddr);
+		outw(0, ioaddr);
+		outb(4, ioaddr + 0xf);
+		outw(scp | 2, ioaddr);
+		outw(scp >> 16, ioaddr);
+	}
 #endif
 
 	lp->last_cmd = jiffies;
 
-#ifdef CONFIG_MVME16x_NET
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x)
 		lp->scp.sysbus = 0x00000054;
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000)
 		lp->scp.sysbus = 0x0000004c;
 #endif
-#ifdef CONFIG_APRICOT
+#ifdef ENABLE_APRICOT
 	if (MACH_IS_APRICOT)
 		lp->scp.sysbus = 0x00440000;
 #endif
 
-	lp->scp.iscp = WSWAPiscp(&(lp->iscp));
-	lp->iscp.scb = WSWAPscb(&(lp->scb));
+	lp->scp.iscp = WSWAPiscp(virt_to_bus(&(lp->iscp)));
+	lp->iscp.scb = WSWAPscb(virt_to_bus(&(lp->scb)));
 	lp->iscp.stat = ISCP_BUSY;
 	lp->cmd_backlog = 0;
 
-	lp->cmd_head = lp->scb.cmd = (struct i596_cmd *) I596_NULL;
+	lp->cmd_head = lp->scb.cmd = I596_NULL;
 
-	if (i596_debug > 1)
-		printk("%s: starting i82596.\n", dev->name);
+	DEB(DEB_INIT,printk("%s: starting i82596.\n", dev->name));
 
-#if !defined(CONFIG_MVME16x_NET) && !defined(CONFIG_BVME6000_NET)
+#if defined(ENABLE_APRICOT)
 	(void) inb(ioaddr + 0x10);
 	outb(4, ioaddr + 0xf);
 #endif
 	CA(dev);
 
-	while (lp->iscp.stat)
-		if (--boguscnt == 0) {
-			printk("%s: i82596 initialization timed out with status %4.4x, cmd %4.4x.\n",
-			     dev->name, lp->scb.status, lp->scb.command);
-			break;
-		}
+	if (wait_istat(dev,lp,1000,"initialization timed out"))
+		goto failed;
+	DEB(DEB_INIT,printk("%s: i82596 initialization successful\n", dev->name));
+
+	/* Ensure rx frame/buffer descriptors are tidy */
+	rebuild_rx_bufs(dev);
 	lp->scb.command = 0;
 
-#ifdef CONFIG_MVME16x_NET
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
 		volatile unsigned char *pcc2 = (unsigned char *) 0xfff42000;
 
 		/* Enable ints, etc. now */
-		pcc2[0x2a] = 0x08;
 		pcc2[0x2a] = 0x55;	/* Edge sensitive */
-		pcc2[0x2b] = 0x55;
+		pcc2[0x2b] = 0x15;
 	}
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
 		volatile unsigned char *ethirq = (unsigned char *) BVME_ETHIRQ_REG;
 
@@ -491,77 +683,131 @@
 	}
 #endif
 
-	memcpy(lp->i596_config, init_setup, 14);
-	lp->set_conf.command = CmdConfigure;
-	i596_add_cmd(dev, &lp->set_conf);
-
-	memcpy(lp->eth_addr, dev->dev_addr, 6);
-	lp->set_add.command = CmdSASetup;
-	i596_add_cmd(dev, &lp->set_add);
 
-	lp->tdr.command = CmdTDR;
-	i596_add_cmd(dev, &lp->tdr);
+	DEB(DEB_INIT,printk("%s: queuing CmdConfigure\n", dev->name));
+	memcpy(lp->cf_cmd.i596_config, init_setup, 14);
+	lp->cf_cmd.cmd.command = CmdConfigure;
+	i596_add_cmd(dev, &lp->cf_cmd.cmd);
+
+	DEB(DEB_INIT,printk("%s: queuing CmdSASetup\n", dev->name));
+	memcpy(lp->sa_cmd.eth_addr, dev->dev_addr, 6);
+	lp->sa_cmd.cmd.command = CmdSASetup;
+	i596_add_cmd(dev, &lp->sa_cmd.cmd);
+
+	DEB(DEB_INIT,printk("%s: queuing CmdTDR\n", dev->name));
+	lp->tdr_cmd.cmd.command = CmdTDR;
+	i596_add_cmd(dev, &lp->tdr_cmd.cmd);
 
-	boguscnt = 200000;
 
 	save_flags(flags);
 	cli();
 
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("%s: receive unit start timed out with status %4.4x, cmd %4.4x.\n",
-			     dev->name, lp->scb.status, lp->scb.command);
-			break;
-		}
+	if (wait_cmd(dev,lp,1000,"timed out waiting to issue RX_START"))
+		goto failed;
+	DEB(DEB_INIT,printk("%s: Issuing RX_START\n", dev->name));
 	lp->scb.command = RX_START;
 	CA(dev);
 
 	restore_flags(flags);
 
-	boguscnt = 2000;
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("i82596 init timed out with status %4.4x, cmd %4.4x.\n",
-			       lp->scb.status, lp->scb.command);
-			break;
-		}
-	return;
+	if (wait_cmd(dev,lp,1000,"RX_START not processed"))
+		goto failed;
+	DEB(DEB_INIT,printk("%s: Receive unit started OK\n", dev->name));
+	return 0;
+
+failed:
+	printk("%s: Failed to initialise 82596\n", dev->name);
+	MPU_PORT(dev, PORT_RESET, 0);
+	return -1;
 }
 
 static inline int i596_rx(struct device *dev)
 {
-	struct i596_private *lp = (struct i596_private *) dev->priv;
+	struct i596_private *lp = (struct i596_private *)dev->priv;
 	struct i596_rfd *rfd;
+	struct i596_rbd *rbd;
 	int frames = 0;
 
-	if (i596_debug > 3)
-		printk("i596_rx()\n");
-
-	rfd = WSWAPrfd(lp->scb.rfd);	/* Reference next frame descriptor to check */
+	DEB(DEB_RXFRAME,printk ("i596_rx(), rfd_head %p, rbd_head %p\n",
+			lp->rfd_head, lp->rbd_head));
 
-	while ((rfd->stat) & STAT_C) {	/* Loop while we have complete frames */
-		if (i596_debug > 2)
-			print_eth(rfd->data);
+	rfd = lp->rfd_head;		/* Ref next frame to check */
 
-		if ((rfd->stat) & STAT_OK) {
+	while ((rfd->stat) & STAT_C) {	/* Loop while complete frames */
+		if (rfd->rbd == I596_NULL)
+			rbd = I596_NULL;
+		else if (rfd->rbd == lp->rbd_head->b_addr)
+			rbd = lp->rbd_head;
+		else {
+			printk("%s: rbd chain broken!\n", dev->name);
+			/* XXX Now what? */
+			rbd = I596_NULL;
+		}
+		DEB(DEB_RXFRAME, printk("  rfd %p, rfd.rbd %p, rfd.stat %04x\n",
+			rfd, rfd->rbd, rfd->stat));
+		
+		if (rbd != I596_NULL && ((rfd->stat) & STAT_OK)) {
 			/* a good frame */
-			int pkt_len = rfd->count & 0x3fff;
-			struct sk_buff *skb = dev_alloc_skb(pkt_len);
+			int pkt_len = rbd->count & 0x3fff;
+			struct sk_buff *skb = rbd->skb;
+			int rx_in_place = 0;
 
+			DEB(DEB_RXADDR,print_eth(rbd->v_data, "received"));
 			frames++;
 
+			/* Check if the packet is long enough to just accept
+			 * without copying to a properly sized skbuff.
+			 */
+
+			if (pkt_len > rx_copybreak) {
+				struct sk_buff *newskb;
+
+				/* Get fresh skbuff to replace filled one. */
+				newskb = dev_alloc_skb(PKT_BUF_SZ);
+				if (newskb == NULL) {
+					skb = NULL;	/* drop pkt */
+					goto memory_squeeze;
+				}
+				/* Pass up the skb already on the Rx ring. */
+				skb_put(skb, pkt_len);
+				rx_in_place = 1;
+				rbd->skb = newskb;
+				newskb->dev = dev;
+				rbd->v_data = newskb->tail;
+				rbd->b_data = WSWAPchar(virt_to_bus(newskb->tail));
+#ifdef __mc68000__
+				cache_clear(virt_to_phys(newskb->tail), PKT_BUF_SZ);
+#endif
+			}
+			else
+				skb = dev_alloc_skb(pkt_len + 2);
+memory_squeeze:
 			if (skb == NULL) {
-				printk("%s: i596_rx Memory squeeze, dropping packet.\n", dev->name);
+				/* XXX tulip.c can defer packets here!! */
+				printk ("%s: i596_rx Memory squeeze, dropping packet.\n", dev->name);
 				lp->stats.rx_dropped++;
-			} else {
+			}
+			else {
 				skb->dev = dev;
-				memcpy(skb_put(skb, pkt_len), rfd->data, pkt_len);
-				skb->protocol = eth_type_trans(skb, dev);
+				if (!rx_in_place) {
+					/* 16 byte align the data fields */
+					skb_reserve(skb, 2);
+					memcpy(skb_put(skb,pkt_len), rbd->v_data, pkt_len);
+				}
+				skb->protocol=eth_type_trans(skb,dev);
+				skb->len = pkt_len;
+#ifdef __mc68000__
+				cache_clear(virt_to_phys(rbd->skb->tail),
+						pkt_len);
+#endif
 				netif_rx(skb);
 				lp->stats.rx_packets++;
-				lp->stats.rx_bytes += pkt_len;
+				lp->stats.rx_bytes+=pkt_len;
 			}
-		} else {
+		}
+		else {
+			DEB(DEB_ERRORS, printk("%s: Error, rfd.stat = 0x%04x\n",
+					dev->name, rfd->stat));
 			lp->stats.rx_errors++;
 			if ((rfd->stat) & 0x0001)
 				lp->stats.collisions++;
@@ -581,33 +827,42 @@
 
 		/* Clear the buffer descriptor count and EOF + F flags */
 
+		if (rbd != I596_NULL && (rbd->count & 0x4000)) {
+			rbd->count = 0;
+			lp->rbd_head = rbd->v_next;
+		}
+
+		/* Tidy the frame descriptor, marking it as end of list */
+
+		rfd->rbd = I596_NULL;
 		rfd->stat = 0;
+		rfd->cmd = CMD_EOL|CMD_FLEX;
 		rfd->count = 0;
-		rfd->cmd = CMD_EOL;
-		lp->rx_tail->cmd = 0;
-		lp->rx_tail = rfd;
-		lp->scb.rfd = rfd->next;
-		rfd = WSWAPrfd(lp->scb.rfd);	/* Next frame descriptor to check */
+
+		/* Remove end-of-list from old end descriptor */
+
+		rfd->v_prev->cmd = CMD_FLEX;
+
+		/* Update record of next frame descriptor to process */
+
+		lp->scb.rfd = rfd->b_next;
+		lp->rfd_head = rfd->v_next;
+		rfd = lp->rfd_head;
 	}
 
-	if (i596_debug > 3)
-		printk("frames %d\n", frames);
+	DEB(DEB_RXFRAME,printk ("frames %d\n", frames));
 
 	return 0;
 }
 
-static inline void i596_cleanup_cmd(struct i596_private *lp)
+
+static inline void i596_cleanup_cmd(struct device *dev, struct i596_private *lp)
 {
 	struct i596_cmd *ptr;
-	int boguscnt = 1000;
-
-	if (i596_debug > 4)
-		printk("i596_cleanup_cmd\n");
 
-	while (lp->cmd_head != (struct i596_cmd *) I596_NULL) {
+	while (lp->cmd_head != I596_NULL) {
 		ptr = lp->cmd_head;
-
-		lp->cmd_head = WSWAPcmd(lp->cmd_head->next);
+		lp->cmd_head = ptr->v_next;
 		lp->cmd_backlog--;
 
 		switch ((ptr->command) & 0x7) {
@@ -621,47 +876,29 @@
 				lp->stats.tx_errors++;
 				lp->stats.tx_aborted_errors++;
 
-				ptr->next = (struct i596_cmd *) I596_NULL;
-				kfree(tx_cmd);
-				break;
-			}
-		case CmdMulticastList:
-			{
-				ptr->next = (struct i596_cmd *) I596_NULL;
-				kfree(ptr);
+				ptr->v_next = ptr->b_next = I596_NULL;
+				tx_cmd->cmd.command = 0;  /* Mark as free */
 				break;
 			}
 		default:
-			ptr->next = (struct i596_cmd *) I596_NULL;
+			ptr->v_next = ptr->b_next = I596_NULL;
 		}
 	}
 
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("i596_cleanup_cmd timed out with status %4.4x, cmd %4.4x.\n",
-			       lp->scb.status, lp->scb.command);
-			break;
-		}
-	lp->scb.cmd = WSWAPcmd(lp->cmd_head);
+	wait_cmd(dev,lp,100,"i596_cleanup_cmd timed out");
+	lp->scb.cmd = I596_NULL;
 }
 
 static inline void i596_reset(struct device *dev, struct i596_private *lp, int ioaddr)
 {
-	int boguscnt = 1000;
 	unsigned long flags;
 
-	if (i596_debug > 1)
-		printk("i596_reset\n");
+	DEB(DEB_RESET,printk("i596_reset\n"));
 
 	save_flags(flags);
 	cli();
 
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("i596_reset timed out with status %4.4x, cmd %4.4x.\n",
-			       lp->scb.status, lp->scb.command);
-			break;
-		}
+	wait_cmd(dev,lp,100,"i596_reset timed out");
 	dev->start = 0;
 	dev->tbusy = 1;
 
@@ -669,17 +906,10 @@
 	CA(dev);
 
 	/* wait for shutdown */
-	boguscnt = 4000;
-
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("i596_reset 2 timed out with status %4.4x, cmd %4.4x.\n",
-			       lp->scb.status, lp->scb.command);
-			break;
-		}
+	wait_cmd(dev,lp,1000,"i596_reset 2 timed out");
 	restore_flags(flags);
 
-	i596_cleanup_cmd(lp);
+	i596_cleanup_cmd(dev,lp);
 	i596_rx(dev);
 
 	dev->start = 1;
@@ -693,14 +923,12 @@
 	struct i596_private *lp = (struct i596_private *) dev->priv;
 	int ioaddr = dev->base_addr;
 	unsigned long flags;
-	int boguscnt = 1000;
 
-	if (i596_debug > 4)
-		printk("i596_add_cmd\n");
+	DEB(DEB_ADDCMD,printk("i596_add_cmd\n"));
 
 	cmd->status = 0;
 	cmd->command |= (CMD_EOL | CMD_INTR);
-	cmd->next = (struct i596_cmd *) I596_NULL;
+	cmd->v_next = cmd->b_next = I596_NULL;
 	save_flags(flags);
 	cli();
 
@@ -714,24 +942,19 @@
 	 * the CU.
 	 */
 
-	if (lp->cmd_head != (struct i596_cmd *) I596_NULL) {
-		lp->cmd_tail->next = WSWAPcmd(cmd);
+	if (lp->cmd_head != I596_NULL) {
+		lp->cmd_tail->v_next = cmd;
+		lp->cmd_tail->b_next = WSWAPcmd(virt_to_bus(&cmd->status));
 	} else {
 		lp->cmd_head = cmd;
-		while (lp->scb.command)
-			if (--boguscnt == 0) {
-				printk("i596_add_cmd timed out with status %4.4x, cmd %4.4x.\n",
-				       lp->scb.status, lp->scb.command);
-				break;
-			}
-		lp->scb.cmd = WSWAPcmd(cmd);
+		wait_cmd(dev,lp,100,"i596_add_cmd timed out");
+		lp->scb.cmd = WSWAPcmd(virt_to_bus(&cmd->status));
 		lp->scb.command = CUC_START;
 		CA(dev);
 	}
 	lp->cmd_tail = cmd;
 	lp->cmd_backlog++;
 
-	lp->cmd_head = WSWAPcmd(lp->scb.cmd);	/* Is this redundant?  RGH 300597 */
 	restore_flags(flags);
 
 	if (lp->cmd_backlog > max_cmd_backlog) {
@@ -748,35 +971,34 @@
 
 static int i596_open(struct device *dev)
 {
-	int i;
+	int res = 0;
 
-	if (i596_debug > 1)
-		printk("%s: i596_open() irq %d.\n", dev->name, dev->irq);
+	DEB(DEB_OPEN,printk("%s: i596_open() irq %d.\n", dev->name, dev->irq));
 
-	if (request_irq(dev->irq, &i596_interrupt, 0, "apricot", dev))
+	if (request_irq(dev->irq, &i596_interrupt, 0, "i82596", dev)) {
+		printk("%s: IRQ %d not free\n", dev->name, dev->irq);
 		return -EAGAIN;
-#ifdef CONFIG_MVME16x_NET
+	}
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
-		if (request_irq(0x56, &i596_error, 0, "apricot_error", dev))
+		if (request_irq(0x56, &i596_error, 0, "i82596_error", dev))
 			return -EAGAIN;
 	}
 #endif
-	if ((i = init_rx_bufs(dev, RX_RING_SIZE)) < RX_RING_SIZE)
-		printk("%s: only able to allocate %d receive buffers\n", dev->name, i);
+	init_rx_bufs(dev);
 
-	if (i < 4) {
-		free_irq(dev->irq, dev);
-		return -EAGAIN;
-	}
 	dev->tbusy = 0;
 	dev->interrupt = 0;
 	dev->start = 1;
 	MOD_INC_USE_COUNT;
 
 	/* Initialize the 82596 memory */
-	init_i596_mem(dev);
+	if (init_i596_mem(dev)) {
+		res = -EAGAIN;
+		free_irq(dev->irq, dev);
+	}
 
-	return 0;		/* Always succeed */
+	return res;
 }
 
 static int i596_start_xmit(struct sk_buff *skb, struct device *dev)
@@ -784,29 +1006,27 @@
 	struct i596_private *lp = (struct i596_private *) dev->priv;
 	int ioaddr = dev->base_addr;
 	struct tx_cmd *tx_cmd;
-
-	if (i596_debug > 2)
-		printk("%s: 82596 start xmit\n", dev->name);
+	struct i596_tbd *tbd;
 
 	/* Transmitter timeout, serious problems. */
 	if (dev->tbusy) {
 		int tickssofar = jiffies - dev->trans_start;
 		if (tickssofar < 5)
 			return 1;
-		printk("%s: transmit timed out, status resetting.\n",
-		       dev->name);
+		DEB(DEB_SERIOUS,printk("%s: transmit timed out, status resetting.\n",
+		       dev->name));
 		lp->stats.tx_errors++;
 		/* Try to restart the adaptor */
 		if (lp->last_restart == lp->stats.tx_packets) {
-			if (i596_debug > 1)
-				printk("Resetting board.\n");
+			DEB(DEB_SERIOUS,printk("%s: Resetting board.\n",
+					dev->name));
 
 			/* Shutdown and restart */
 			i596_reset(dev, lp, ioaddr);
 		} else {
 			/* Issue a channel attention signal */
-			if (i596_debug > 1)
-				printk("Kicking board.\n");
+			DEB(DEB_SERIOUS,printk("%s: Kicking board.\n",
+					dev->name));
 			lp->scb.command = CUC_START | RX_START;
 			CA(dev);
 			lp->last_restart = lp->stats.tx_packets;
@@ -814,8 +1034,8 @@
 		dev->tbusy = 0;
 		dev->trans_start = jiffies;
 	}
-	if (i596_debug > 3)
-		printk("%s: i596_start_xmit() called\n", dev->name);
+	DEB(DEB_STARTTX,printk("%s: i596_start_xmit(%x,%x) called\n", dev->name,
+				skb->len, (unsigned int)skb->data));
 
 	/* Block a timer-based transmit from overlapping.  This could better be
 	   done with atomic_swap(1, dev->tbusy), but set_bit() works as well. */
@@ -825,16 +1045,20 @@
 		short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
 		dev->trans_start = jiffies;
 
-		tx_cmd = (struct tx_cmd *) kmalloc((sizeof(struct tx_cmd) + sizeof(struct i596_tbd)), GFP_ATOMIC);
-		if (tx_cmd == NULL) {
-			printk("%s: i596_xmit Memory squeeze, dropping packet.\n", dev->name);
+		tx_cmd = lp->tx_cmds + lp->next_tx_cmd;
+		tbd = lp->tbds + lp->next_tx_cmd;
+
+		if (tx_cmd->cmd.command) {
+			DEB(DEB_ERRORS,printk ("%s: xmit ring full, dropping packet.\n",
+					dev->name));
 			lp->stats.tx_dropped++;
 
 			dev_kfree_skb(skb);
 		} else {
-			struct i596_tbd *tbd = (struct i596_tbd *) (tx_cmd + 1);
-			tx_cmd->tbd = WSWAPtbd(tbd);
-			tbd->next = (struct i596_tbd *) I596_NULL;
+			if (++lp->next_tx_cmd == TX_RING_SIZE)
+				lp->next_tx_cmd = 0;
+			tx_cmd->tbd = WSWAPtbd(virt_to_bus(tbd));
+			tbd->next = I596_NULL;
 
 			tx_cmd->cmd.command = CMD_FLEX | CmdTx;
 			tx_cmd->skb = skb;
@@ -844,11 +1068,13 @@
 			tbd->pad = 0;
 			tbd->size = EOF | length;
 
-			tbd->data = WSWAPchar(skb->data);
+			tbd->data = WSWAPchar(virt_to_bus(skb->data));
 
-			if (i596_debug > 3)
-				print_eth(skb->data);
-			i596_add_cmd(dev, (struct i596_cmd *) tx_cmd);
+#ifdef __mc68000__
+			cache_push(virt_to_phys(skb->data), length);
+#endif
+			DEB(DEB_TXADDR,print_eth(skb->data, "tx-queued"));
+			i596_add_cmd(dev, &tx_cmd->cmd);
 
 			lp->stats.tx_packets++;
 			lp->stats.tx_bytes += length;
@@ -859,23 +1085,18 @@
 
 	return 0;
 }
-
 
-static void print_eth(char *add)
+static void print_eth(unsigned char *add, char *str)
 {
 	int i;
 
-	printk("print_eth(%08x)\n", (unsigned int) add);
-	printk("Dest  ");
+	printk("i596 0x%p, ", add);
 	for (i = 0; i < 6; i++)
-		printk(" %2.2X", (unsigned char) add[i]);
-	printk("\n");
-
-	printk("Source");
+		printk(" %02X", add[i + 6]);
+	printk(" -->");
 	for (i = 0; i < 6; i++)
-		printk(" %2.2X", (unsigned char) add[i + 6]);
-	printk("\n");
-	printk("type %2.2X%2.2X\n", (unsigned char) add[12], (unsigned char) add[13]);
+		printk(" %02X", add[i]);
+	printk(" %02X%02X, %s\n", add[12], add[13], str);
 }
 
 __initfunc(int i82596_probe(struct device *dev))
@@ -883,24 +1104,25 @@
 	int i;
 	struct i596_private *lp;
 	char eth_addr[6];
+	static int probed = 0;
 
-#ifdef CONFIG_MVME16x_NET
+	if (probed)
+		return -ENODEV;
+	probed++;
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
-		static int probed = 0;
-
+#ifdef XXX_FIXME
 		if (mvme16x_config & MVME16x_CONFIG_NO_ETHERNET) {
 			printk("Ethernet probe disabled - chip not present\n");
-			return ENODEV;
+			return -ENODEV;
 		}
-		if (probed)
-			return ENODEV;
-		probed++;
+#endif
 		memcpy(eth_addr, (void *) 0xfffc1f2c, 6);	/* YUCK! Get addr from NOVRAM */
 		dev->base_addr = MVME_I596_BASE;
 		dev->irq = (unsigned) MVME16x_IRQ_I596;
 	}
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
 		volatile unsigned char *rtc = (unsigned char *) BVME_RTC_BASE;
 		unsigned char msr = rtc[3];
@@ -914,69 +1136,84 @@
 		dev->irq = (unsigned) BVME_IRQ_I596;
 	}
 #endif
-#ifdef CONFIG_APRICOT
-	int checksum = 0;
-	int ioaddr = 0x300;
+#ifdef ENABLE_APRICOT
+	{
+		int checksum = 0;
+		int ioaddr = 0x300;
 
-	/* this is easy the ethernet interface can only be at 0x300 */
-	/* first check nothing is already registered here */
+		/* this is easy the ethernet interface can only be at 0x300 */
+		/* first check nothing is already registered here */
 
-	if (check_region(ioaddr, I596_TOTAL_SIZE))
-		return ENODEV;
+		if (check_region(ioaddr, I596_TOTAL_SIZE)) {
+			printk("82596: IO address 0x%04x in use\n", ioaddr);
+			return -ENODEV;
+		}
 
-	for (i = 0; i < 8; i++) {
-		eth_addr[i] = inb(ioaddr + 8 + i);
-		checksum += eth_addr[i];
-	}
+		for (i = 0; i < 8; i++) {
+			eth_addr[i] = inb(ioaddr + 8 + i);
+			checksum += eth_addr[i];
+		}
 
-	/* checksum is a multiple of 0x100, got this wrong first time
-	   some machines have 0x100, some 0x200. The DOS driver doesn't
-	   even bother with the checksum */
+		/* checksum is a multiple of 0x100, got this wrong first time
+		   some machines have 0x100, some 0x200. The DOS driver doesn't
+		   even bother with the checksum */
 
-	if (checksum % 0x100)
-		return ENODEV;
+		if (checksum % 0x100)
+			return -ENODEV;
 
-	/* Some other boards trip the checksum.. but then appear as ether
-	   address 0. Trap these - AC */
+		/* 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;
+		if (memcmp(eth_addr, "\x00\x00\x49", 3) != 0)
+			return -ENODEV;
 
-	request_region(ioaddr, I596_TOTAL_SIZE, "i596");
+		request_region(ioaddr, I596_TOTAL_SIZE, "i596");
 
-	dev->base_addr = ioaddr;
-	dev->irq = 10;
+		dev->base_addr = ioaddr;
+		dev->irq = 10;
+	}
+#endif
+	dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0);
+	if (!dev->mem_start) {
+#ifdef ENABLE_APRICOT
+		release_region(dev->base_addr, I596_TOTAL_SIZE);
 #endif
+		return -ENOMEM;
+	}
+
 	ether_setup(dev);
-	printk("%s: 82596 at %#3lx,", dev->name, dev->base_addr);
+	DEB(DEB_PROBE,printk("%s: 82596 at %#3lx,", dev->name, dev->base_addr));
 
 	for (i = 0; i < 6; i++)
-		printk(" %2.2X", dev->dev_addr[i] = eth_addr[i]);
+		DEB(DEB_PROBE,printk(" %2.2X", dev->dev_addr[i] = eth_addr[i]));
 
-	printk(" IRQ %d.\n", dev->irq);
+	DEB(DEB_PROBE,printk(" IRQ %d.\n", dev->irq));
 
-	if (i596_debug > 0)
-		printk(version);
+	DEB(DEB_PROBE,printk(version));
 
-	/* The APRICOT-specific entries in the device structure. */
+	/* The 82596-specific entries in the device structure. */
 	dev->open = &i596_open;
 	dev->stop = &i596_close;
 	dev->hard_start_xmit = &i596_start_xmit;
 	dev->get_stats = &i596_get_stats;
 	dev->set_multicast_list = &set_multicast_list;
 
-	dev->mem_start = (int) kmalloc(sizeof(struct i596_private) + 0x0f, GFP_KERNEL);
-	/* align for scp */
-	dev->priv = (void *) ((dev->mem_start + 0xf) & 0xfffffff0);
+	dev->priv = (void *)(dev->mem_start);
 
 	lp = (struct i596_private *) dev->priv;
-	if (i596_debug)
-		printk("%s: lp at 0x%08lx, lp->scb at 0x%08lx\n"
-		,dev->name, (unsigned long) lp, (unsigned long) &lp->scb);
+	DEB(DEB_INIT,printk ("%s: lp at 0x%08lx (%d bytes), lp->scb at 0x%08lx\n",
+			dev->name, (unsigned long)lp,
+			sizeof(struct i596_private), (unsigned long)&lp->scb));
 	memset((void *) lp, 0, sizeof(struct i596_private));
+
+#ifdef __mc68000__
+	cache_push(virt_to_phys((void *)(dev->mem_start)), 4096);
+	cache_clear(virt_to_phys((void *)(dev->mem_start)), 4096);
+	kernel_set_cachemode((void *)(dev->mem_start), 4096, IOMAP_NOCACHE_SER);
+#endif
 	lp->scb.command = 0;
-	lp->scb.cmd = (struct i596_cmd *) I596_NULL;
-	lp->scb.rfd = (struct i596_rfd *) I596_NULL;
+	lp->scb.cmd = I596_NULL;
+	lp->scb.rfd = I596_NULL;
 
 	return 0;
 }
@@ -986,10 +1223,9 @@
 	struct device *dev = dev_id;
 	struct i596_private *lp;
 	short ioaddr;
-	int boguscnt = 2000;
 	unsigned short status, ack_cmd = 0;
 
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
 		if (*(char *) BVME_LOCAL_IRQ_STAT & BVME_ETHERR) {
 			i596_error(BVME_IRQ_I596, NULL, NULL);
@@ -1001,8 +1237,6 @@
 		printk("i596_interrupt(): irq %d for unknown device.\n", irq);
 		return;
 	}
-	if (i596_debug > 3)
-		printk("%s: i596_interrupt(): irq %d\n", dev->name, irq);
 
 	if (dev->interrupt)
 		printk("%s: Re-entering the interrupt handler.\n", dev->name);
@@ -1013,140 +1247,113 @@
 
 	lp = (struct i596_private *) dev->priv;
 
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("%s: i596 interrupt, timeout status %4.4x command %4.4x.\n", dev->name, lp->scb.status, lp->scb.command);
-			break;
-		}
+	wait_cmd(dev,lp,100,"i596 interrupt, timeout");
 	status = lp->scb.status;
 
-	if (i596_debug > 4)
-		printk("%s: i596 interrupt, status %4.4x.\n", dev->name, status);
+	DEB(DEB_INTS,printk("%s: i596 interrupt, IRQ %d, status %4.4x.\n",
+			dev->name, irq, status));
 
 	ack_cmd = status & 0xf000;
 
 	if ((status & 0x8000) || (status & 0x2000)) {
 		struct i596_cmd *ptr;
 
-		if ((i596_debug > 4) && (status & 0x8000))
-			printk("%s: i596 interrupt completed command.\n", dev->name);
-		if ((i596_debug > 4) && (status & 0x2000))
-			printk("%s: i596 interrupt command unit inactive %x.\n", dev->name, status & 0x0700);
+		if ((status & 0x8000))
+			DEB(DEB_INTS,printk("%s: i596 interrupt completed command.\n", dev->name));
+		if ((status & 0x2000))
+			DEB(DEB_INTS,printk("%s: i596 interrupt command unit inactive %x.\n", dev->name, status & 0x0700));
 
-		while ((lp->cmd_head != (struct i596_cmd *) I596_NULL) && (lp->cmd_head->status & STAT_C)) {
+		while ((lp->cmd_head != I596_NULL) && (lp->cmd_head->status & STAT_C)) {
 			ptr = lp->cmd_head;
 
-			if (i596_debug > 2)
-				printk("cmd_head->status = %04x, ->command = %04x\n",
-				       lp->cmd_head->status, lp->cmd_head->command);
-			lp->cmd_head = WSWAPcmd(lp->cmd_head->next);
+			DEB(DEB_STATUS,printk("cmd_head->status = %04x, ->command = %04x\n",
+				       lp->cmd_head->status, lp->cmd_head->command));
+			lp->cmd_head = ptr->v_next;
 			lp->cmd_backlog--;
 
 			switch ((ptr->command) & 0x7) {
 			case CmdTx:
-				{
-					struct tx_cmd *tx_cmd = (struct tx_cmd *) ptr;
-					struct sk_buff *skb = tx_cmd->skb;
-
-					if ((ptr->status) & STAT_OK) {
-						if (i596_debug > 2)
-							print_eth(skb->data);
-					} else {
-						lp->stats.tx_errors++;
-						if ((ptr->status) & 0x0020)
-							lp->stats.collisions++;
-						if (!((ptr->status) & 0x0040))
-							lp->stats.tx_heartbeat_errors++;
-						if ((ptr->status) & 0x0400)
-							lp->stats.tx_carrier_errors++;
-						if ((ptr->status) & 0x0800)
-							lp->stats.collisions++;
-						if ((ptr->status) & 0x1000)
-							lp->stats.tx_aborted_errors++;
-					}
-
-					dev_kfree_skb(skb);
-
-					ptr->next = (struct i596_cmd *) I596_NULL;
-					kfree(tx_cmd);
-					break;
-				}
-			case CmdMulticastList:
-				{
-					ptr->next = (struct i596_cmd *) I596_NULL;
-					kfree(ptr);
-					break;
+			    {
+				struct tx_cmd *tx_cmd = (struct tx_cmd *) ptr;
+				struct sk_buff *skb = tx_cmd->skb;
+
+				if ((ptr->status) & STAT_OK) {
+					DEB(DEB_TXADDR,print_eth(skb->data, "tx-done"));
+				} else {
+					lp->stats.tx_errors++;
+					if ((ptr->status) & 0x0020)
+						lp->stats.collisions++;
+					if (!((ptr->status) & 0x0040))
+						lp->stats.tx_heartbeat_errors++;
+					if ((ptr->status) & 0x0400)
+						lp->stats.tx_carrier_errors++;
+					if ((ptr->status) & 0x0800)
+						lp->stats.collisions++;
+					if ((ptr->status) & 0x1000)
+						lp->stats.tx_aborted_errors++;
 				}
+
+				dev_kfree_skb(skb);
+
+				tx_cmd->cmd.command = 0; /* Mark free */
+				break;
+			    }
 			case CmdTDR:
-				{
-					unsigned long status = *((unsigned long *) (ptr + 1));
+			    {
+				unsigned short status = ((struct tdr_cmd *)ptr)->status;
+
+				if (status & 0x8000) {
+					DEB(DEB_ANY,printk("%s: link ok.\n", dev->name));
+				} else {
+					if (status & 0x4000)
+						printk("%s: Transceiver problem.\n", dev->name);
+					if (status & 0x2000)
+						printk("%s: Termination problem.\n", dev->name);
+					if (status & 0x1000)
+						printk("%s: Short circuit.\n", dev->name);
 
-					if (status & 0x8000) {
-						if (i596_debug > 3)
-							printk("%s: link ok.\n", dev->name);
-					} else {
-						if (status & 0x4000)
-							printk("%s: Transceiver problem.\n", dev->name);
-						if (status & 0x2000)
-							printk("%s: Termination problem.\n", dev->name);
-						if (status & 0x1000)
-							printk("%s: Short circuit.\n", dev->name);
-
-						if (i596_debug > 1)
-							printk("%s: Time %ld.\n", dev->name, status & 0x07ff);
-					}
-					break;
+					DEB(DEB_TDR,printk("%s: Time %d.\n", dev->name, status & 0x07ff));
 				}
+				break;
+			    }
 			case CmdConfigure:
-				{
-					ptr->next = (struct i596_cmd *) I596_NULL;
-					/* Zap command so set_multicast_list() knows it is free */
-					ptr->command = 0;
-					break;
-				}
-			default:
-				ptr->next = (struct i596_cmd *) I596_NULL;
+				/* Zap command so set_multicast_list() knows it is free */
+				ptr->command = 0;
+				break;
 			}
+			ptr->v_next = ptr->b_next = I596_NULL;
 			lp->last_cmd = jiffies;
 		}
 
 		ptr = lp->cmd_head;
-		while ((ptr != (struct i596_cmd *) I596_NULL) && (ptr != lp->cmd_tail)) {
+		while ((ptr != I596_NULL) && (ptr != lp->cmd_tail)) {
 			ptr->command &= 0x1fff;
-			ptr = WSWAPcmd(ptr->next);
+			ptr = ptr->v_next;
 		}
 
-		if ((lp->cmd_head != (struct i596_cmd *) I596_NULL) && (dev->start))
+		if ((lp->cmd_head != I596_NULL) && (dev->start))
 			ack_cmd |= CUC_START;
-		lp->scb.cmd = WSWAPcmd(lp->cmd_head);
+		lp->scb.cmd = WSWAPcmd(virt_to_bus(&lp->cmd_head->status));
 	}
 	if ((status & 0x1000) || (status & 0x4000)) {
-		if ((i596_debug > 4) && (status & 0x4000))
-			printk("%s: i596 interrupt received a frame.\n", dev->name);
+		if ((status & 0x4000))
+			DEB(DEB_INTS,printk("%s: i596 interrupt received a frame.\n", dev->name));
+		i596_rx(dev);
 		/* Only RX_START if stopped - RGH 07-07-96 */
 		if (status & 0x1000) {
-			if (dev->start)
+			if (dev->start) {
+				DEB(DEB_ERRORS,printk("%s: i596 interrupt receive unit inactive, status 0x%x\n", dev->name, status));
 				ack_cmd |= RX_START;
-			if (i596_debug > 1)
-				printk("%s: i596 interrupt receive unit inactive %x.\n", dev->name, status & 0x00f0);
+				lp->stats.rx_errors++;
+				lp->stats.rx_fifo_errors++;
+				rebuild_rx_bufs(dev);
+			}
 		}
-		i596_rx(dev);
 	}
-	/* acknowledge the interrupt */
-
-/*      COMMENTED OUT <<<<<
-   if ((lp->scb.cmd != (struct i596_cmd *) I596_NULL) && (dev->start))
-   ack_cmd |= CUC_START;
- */
-	boguscnt = 1000;
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("%s: i596 interrupt, timeout status %4.4x command %4.4x.\n", dev->name, lp->scb.status, lp->scb.command);
-			break;
-		}
+	wait_cmd(dev,lp,100,"i596 interrupt, timeout");
 	lp->scb.command = ack_cmd;
 
-#ifdef CONFIG_MVME16x_NET
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
 		/* Ack the interrupt */
 
@@ -1155,7 +1362,7 @@
 		pcc2[0x2a] |= 0x08;
 	}
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
 		volatile unsigned char *ethirq = (unsigned char *) BVME_ETHIRQ_REG;
 
@@ -1163,14 +1370,13 @@
 		*ethirq = 3;
 	}
 #endif
-#ifdef CONFIG_APRICOT
+#ifdef ENABLE_APRICOT
 	(void) inb(ioaddr + 0x10);
 	outb(4, ioaddr + 0xf);
 #endif
 	CA(dev);
 
-	if (i596_debug > 4)
-		printk("%s: exiting interrupt.\n", dev->name);
+	DEB(DEB_INTS,printk("%s: exiting interrupt.\n", dev->name));
 
 	dev->interrupt = 0;
 	return;
@@ -1179,41 +1385,27 @@
 static int i596_close(struct device *dev)
 {
 	struct i596_private *lp = (struct i596_private *) dev->priv;
-	int boguscnt = 2000;
 	unsigned long flags;
 
 	dev->start = 0;
 	dev->tbusy = 1;
 
-	if (i596_debug > 1)
-		printk("%s: Shutting down ethercard, status was %4.4x.\n",
-		       dev->name, lp->scb.status);
+	DEB(DEB_INIT,printk("%s: Shutting down ethercard, status was %4.4x.\n",
+		       dev->name, lp->scb.status));
 
 	save_flags(flags);
 	cli();
 
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("%s: close1 timed out with status %4.4x, cmd %4.4x.\n",
-			     dev->name, lp->scb.status, lp->scb.command);
-			break;
-		}
+	wait_cmd(dev,lp,100,"close1 timed out");
 	lp->scb.command = CUC_ABORT | RX_ABORT;
 	CA(dev);
 
-	boguscnt = 2000;
-
-	while (lp->scb.command)
-		if (--boguscnt == 0) {
-			printk("%s: close2 timed out with status %4.4x, cmd %4.4x.\n",
-			     dev->name, lp->scb.status, lp->scb.command);
-			break;
-		}
+	wait_cmd(dev,lp,100,"close2 timed out");
 	restore_flags(flags);
+	DEB(DEB_STRUCT,i596_display_data(dev));
+	i596_cleanup_cmd(dev,lp);
 
-	i596_cleanup_cmd(lp);
-
-#ifdef CONFIG_MVME16x_NET
+#ifdef ENABLE_MVME16x_NET
 	if (MACH_IS_MVME16x) {
 		volatile unsigned char *pcc2 = (unsigned char *) 0xfff42000;
 
@@ -1223,7 +1415,7 @@
 		pcc2[0x2b] = 0x40;	/* Set snooping bits now! */
 	}
 #endif
-#ifdef CONFIG_BVME6000_NET
+#ifdef ENABLE_BVME6000_NET
 	if (MACH_IS_BVME6000) {
 		volatile unsigned char *ethirq = (unsigned char *) BVME_ETHIRQ_REG;
 
@@ -1253,57 +1445,60 @@
 static void set_multicast_list(struct device *dev)
 {
 	struct i596_private *lp = (struct i596_private *) dev->priv;
-	struct i596_cmd *cmd;
-	int config = 0;
+	int config = 0, cnt;
 
-	if (i596_debug > 1)
-		printk("%s: set multicast list, %d entries, promisc %s, allmulti %s\n", dev->name, dev->mc_count, dev->flags & IFF_PROMISC ? "ON" : "OFF", dev->flags & IFF_ALLMULTI ? "ON" : "OFF");
+	DEB(DEB_MULTI,printk("%s: set multicast list, %d entries, promisc %s, allmulti %s\n", dev->name, dev->mc_count, dev->flags & IFF_PROMISC ? "ON" : "OFF", dev->flags & IFF_ALLMULTI ? "ON" : "OFF"));
 
-	if ((dev->flags & IFF_PROMISC) && !(lp->i596_config[8] & 0x01)) {
-		lp->i596_config[8] |= 0x01;
+	if ((dev->flags & IFF_PROMISC) && !(lp->cf_cmd.i596_config[8] & 0x01)) {
+		lp->cf_cmd.i596_config[8] |= 0x01;
 		config = 1;
 	}
-	if (!(dev->flags & IFF_PROMISC) && (lp->i596_config[8] & 0x01)) {
-		lp->i596_config[8] &= ~0x01;
+	if (!(dev->flags & IFF_PROMISC) && (lp->cf_cmd.i596_config[8] & 0x01)) {
+		lp->cf_cmd.i596_config[8] &= ~0x01;
 		config = 1;
 	}
-	if ((dev->flags & IFF_ALLMULTI) && (lp->i596_config[11] & 0x20)) {
-		lp->i596_config[11] &= ~0x20;
+	if ((dev->flags & IFF_ALLMULTI) && (lp->cf_cmd.i596_config[11] & 0x20)) {
+		lp->cf_cmd.i596_config[11] &= ~0x20;
 		config = 1;
 	}
-	if (!(dev->flags & IFF_ALLMULTI) && !(lp->i596_config[11] & 0x20)) {
-		lp->i596_config[11] |= 0x20;
+	if (!(dev->flags & IFF_ALLMULTI) && !(lp->cf_cmd.i596_config[11] & 0x20)) {
+		lp->cf_cmd.i596_config[11] |= 0x20;
 		config = 1;
 	}
 	if (config) {
-		if (lp->set_conf.command)
+		if (lp->cf_cmd.cmd.command)
 			printk("%s: config change request already queued\n",
 			       dev->name);
 		else {
-			lp->set_conf.command = CmdConfigure;
-			i596_add_cmd(dev, &lp->set_conf);
+			lp->cf_cmd.cmd.command = CmdConfigure;
+			i596_add_cmd(dev, &lp->cf_cmd.cmd);
 		}
 	}
+
+	cnt = dev->mc_count;
+	if (cnt > MAX_MC_CNT)
+	{
+		cnt = MAX_MC_CNT;
+		printk("%s: Only %d multicast addresses supported",
+			dev->name, cnt);
+	}
+	
 	if (dev->mc_count > 0) {
 		struct dev_mc_list *dmi;
 		unsigned char *cp;
-		cmd = (struct i596_cmd *) kmalloc(sizeof(struct i596_cmd) + 2 + dev->mc_count * 6, GFP_ATOMIC);
-		if (cmd == NULL) {
-			printk("%s: set_multicast Memory squeeze.\n", dev->name);
-			return;
-		}
-		cmd->command = CmdMulticastList;
-		*((unsigned short *) (cmd + 1)) = dev->mc_count * 6;
-		cp = ((unsigned char *) (cmd + 1)) + 2;
-		for (dmi = dev->mc_list; dmi != NULL; dmi = dmi->next) {
+		struct mc_cmd *cmd;
+
+		cmd = &lp->mc_cmd;
+		cmd->cmd.command = CmdMulticastList;
+		cmd->mc_cnt = dev->mc_count * 6;
+		cp = cmd->mc_addrs;
+		for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) {
 			memcpy(cp, dmi->dmi_addr, 6);
 			if (i596_debug > 1)
-				printk("%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, *(cp + 0), *(cp + 1), *(cp + 2), *(cp + 3), *(cp + 4), *(cp + 5));
-			cp += 6;
+				DEB(DEB_MULTI,printk("%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n",
+						dev->name, cp[0],cp[1],cp[2],cp[3],cp[4],cp[5]));
 		}
-		if (i596_debug > 2)
-			print_eth(((char *) (cmd + 1)) + 2);
-		i596_add_cmd(dev, cmd);
+		i596_add_cmd(dev, &cmd->cmd);
 	}
 }
 
@@ -1311,40 +1506,58 @@
 static unsigned int i596_portlist[] __initdata =
 {0x300, 0};
 struct netdev_entry i596_drv =
-{"apricot", i82596_probe, I596_TOTAL_SIZE, apricot_portlist};
+{"i82596", i82596_probe, I596_TOTAL_SIZE, i596_portlist};
 #endif
 
 #ifdef MODULE
 static char devicename[9] =
 {0,};
-static struct device dev_apricot =
+static struct device dev_82596 =
 {
-	devicename,		/* device name inserted by /linux/drivers/net/net_init.c */
+	devicename,	/* device name inserted by drivers/net/net_init.c */
 	0, 0, 0, 0,
-	0x300, 10,
+	0, 0,		/* base, irq */
 	0, 0, 0, NULL, i82596_probe};
 
+#ifdef ENABLE_APRICOT
 static int io = 0x300;
 static int irq = 10;
 MODULE_PARM(irq, "i");
+#endif
+
+MODULE_PARM(debug, "i");
+static int debug = -1;
 
 int init_module(void)
 {
-	dev_apricot.base_addr = io;
-	dev_apricot.irq = irq;
-	if (register_netdev(&dev_apricot) != 0)
+#ifdef ENABLE_APRICOT
+	dev_82596.base_addr = io;
+	dev_82596.irq = irq;
+#endif
+	if (debug >= 0)
+		i596_debug = debug;
+	if (register_netdev(&dev_82596) != 0)
 		return -EIO;
 	return 0;
 }
 
 void cleanup_module(void)
 {
-	unregister_netdev(&dev_apricot);
-	kfree((void *) dev_apricot.mem_start);
-	dev_apricot.priv = NULL;
+	unregister_netdev(&dev_82596);
+#ifdef __mc68000__
+	/* XXX This assumes default cache mode to be IOMAP_FULL_CACHING,
+	 * XXX which may be invalid (CONFIG_060_WRITETHROUGH)
+	 */
 
+	kernel_set_cachemode((void *)(dev_82596.mem_start), 4096,
+			IOMAP_FULL_CACHING);
+#endif
+	free_page ((u32)(dev_82596.mem_start));
+	dev_82596.priv = NULL;
+#ifdef ENABLE_APRICOT
 	/* If we don't do this, we can't re-insmod it later. */
-	release_region(dev_apricot.base_addr, I596_TOTAL_SIZE);
+	release_region(dev_82596.base_addr, I596_TOTAL_SIZE);
+#endif
 }
 
 #endif				/* MODULE */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)