patch-1.3.72 linux/drivers/net/de4x5.c

Next file: linux/drivers/net/de4x5.h
Previous file: linux/drivers/net/Space.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.71/linux/drivers/net/de4x5.c linux/drivers/net/de4x5.c
@@ -8,9 +8,10 @@
     This driver is written for the Digital Equipment Corporation series
     of EtherWORKS ethernet cards:
 
-	DE425 TP/COAX EISA
+        DE425 TP/COAX EISA
 	DE434 TP PCI
 	DE435 TP/COAX/AUI PCI
+	DE450 TP/COAX/AUI PCI
 	DE500 10/100 PCI Fasternet
 
     The driver has been tested on a relatively busy network using the DE425,
@@ -28,7 +29,7 @@
     measurement. Their error is +/-20k on a quiet (private) network and also
     depend on what load the CPU has.
 
-    The author may    be  reached as davies@wanton.lkg.dec.com  or   Digital
+    The author may    be reached  at  davies@wanton.lkg.dec.com  or  Digital
     Equipment Corporation, 550 King Street, Littleton MA 01460.
 
     =========================================================================
@@ -41,51 +42,53 @@
     multiple depca, EtherWORKS 3 cards and de4x5 cards and  have not found a
     problem yet (provided you have at least depca.c v0.38) ...
 
-    PCI support  has been added  to allow the  driver to work with the DE434
-    and  DE435 cards. The I/O  accesses  are a  bit of a   kludge due to the
-    differences  in the  EISA and PCI    CSR address offsets  from the  base
+    PCI support has been added  to allow the driver  to work with the DE434,
+    DE435, DE450 and DE500 cards. The I/O accesses are a bit of a kludge due
+    to the differences in the EISA and PCI CSR address offsets from the base
     address.
 
-    The ability to load  this driver as a loadable  module has been included
-    and  used extensively during the  driver development (to save those long
-    reboot sequences).  Loadable module support under  PCI has been achieved
-    by letting any I/O address less than 0x1000 be assigned as:
-
-                       0xghh
-
-    where g is the bus number (usually 0 until the BIOS's get fixed)
-         hh is the device number (max is 32 per bus).
+    The ability to load  this driver as a  loadable module has been included
+    and used  extensively during the  driver development (to save those long
+    reboot sequences).  Loadable module support  under PCI and EISA has been
+    achieved by letting the driver autoprobe as if it were compiled into the
+    kernel, except that there is no autoprobing of the IRQ lines. This is of
+    no great  consequence except do make sure  you're not sharing interrupts
+    with  anything that cannot  accomodate  interrupt sharing!  The existing
+    register_netdevice() code will only allow one device to be registered at
+    a time. 
+
+    ************************************************************************
+    For now, please only use the 'io=??' assignment (see  2. below, ?? != 0)
+    when loading a module.
+    ************************************************************************
 
     Essentially, the I/O address and IRQ information  are ignored and filled
     in later by  the PCI BIOS   during the PCI  probe.  Note  that the board
     should be in the system at boot time so that its I/O address and IRQ are
-    allocated by the PCI BIOS automatically. The special case of device 0 on
-    bus 0  is  not allowed  as  the probe  will think   you're autoprobing a
-    module.
+    allocated by the PCI BIOS automatically. 
 
     To utilise this ability, you have to do 8 things:
 
     0) have a copy of the loadable modules code installed on your system.
     1) copy de4x5.c from the  /linux/drivers/net directory to your favourite
     temporary directory.
-    2) edit the  source code near  line 2762 to reflect  the I/O address and
-    IRQ you're using, or assign these when loading by:
+    2) edit the source code near line 3779 to reflect the I/O address you're
+    using (only  if you want to manually  load the module),  or assign these
+    when loading by:
 
-                   insmod de4x5.o irq=x io=y
+                   insmod de4x5.o io=0xghh         where g = bus number
+		                                        hh = device number   
 
     3) compile  de4x5.c, but include -DMODULE in  the command line to ensure
     that the correct bits are compiled (see end of source code).
     4) if you are wanting to add a new  card, goto 5. Otherwise, recompile a
     kernel with the de4x5 configuration turned off and reboot.
-    5) insmod de4x5.o
-    6) run the net startup bits for your new eth?? interface manually 
+    5) insmod de4x5.o [io=0xghh]
+    6) run the net startup bits for your new eth?? interface(s) manually 
     (usually /etc/rc.inet[12] at boot time). 
     7) enjoy!
 
-    Note that autoprobing is not allowed in loadable modules - the system is
-    already up and running and you're messing with interrupts.
-
-    To unload a module, turn off the associated interface 
+    To unload a module, turn off the associated interface(s) 
     'ifconfig eth?? down' then 'rmmod de4x5'.
 
     Automedia detection is included so that in  principal you can disconnect
@@ -93,13 +96,30 @@
     pause whilst the   driver figures out   where its media went).  My tests
     using ping showed that it appears to work....
 
-    A compile time  switch to allow  Znyx  recognition has been  added. This
-    "feature" is in no way supported nor tested  in this driver and the user
-    may use it at his/her sole discretion.  I have had 2 conflicting reports
-    that  my driver  will or   won't  work with   Znyx. Try Donald  Becker's
-    'tulip.c' if this driver doesn't work for  you. I will not be supporting
-    Znyx cards since I have no information on them  and can't test them in a
-    system.
+    By  default,  the driver will  now   autodetect any  DECchip based card.
+    Should you have a need to restrict the driver to DIGITAL only cards, you
+    can compile with a  DEC_ONLY define, or if  loading as a module, use the
+    'dec_only=1'  parameter. However, this  "feature" is in no way supported
+    nor  tested in this  driver  and the user  may use  it  at his/her  sole
+    discretion.   I have had  2 conflicting reports that  my  driver will or
+    won't work  with Znyx.   Try  Donald Becker's 'tulip.c' if   this driver
+    doesn't work for you. I will not be supporting Znyx  and SMC cards since
+    I have  no information on  them and  can't test  them in  a system (this
+    applies most particularly to the DC21140 based cards).
+
+    I've changed the timing routines to  use the kernel timer and scheduling
+    functions  so that the  hangs  and other assorted  problems that occured
+    while autosensing the  media  should be gone.  A  bonus  for the DC21040
+    auto  media sense algorithm is  that it can now  use one that is more in
+    line with the  rest (the DC21040  chip doesn't  have a hardware  timer).
+    The downside is the 1 'jiffies' (10ms) resolution.
+
+    IEEE 802.3u MII interface code has  been added in anticipation that some
+    products may use it in the future.
+
+    The SMC9332 card  has a non-compliant SROM  which needs fixing -  I have
+    patched this  driver to detect it  because the SROM format used complies
+    to a previous DEC-STD format.
 
     TO DO:
     ------
@@ -126,22 +146,41 @@
 			  Change media autodetection to allow manual setting.
 			  Completed DE500 (DC21140) support.
       0.241   18-Apr-95   Interim release without DE500 Autosense Algorithm.
-      0.242   10-May-95   Minor changes
-      0.30    12-Jun-95   Timer fix for DC21140
+      0.242   10-May-95   Minor changes.
+      0.30    12-Jun-95   Timer fix for DC21140.
                           Portability changes.
 			  Add ALPHA changes from <jestabro@ant.tay1.dec.com>.
 			  Add DE500 semi automatic autosense.
 			  Add Link Fail interrupt TP failure detection.
 			  Add timer based link change detection.
 			  Plugged a memory leak in de4x5_queue_pkt().
-      0.31    13-Jun-95   Fixed PCI stuff for 1.3.1
-      0.32    26-Jun-95   Added verify_area() calls in de4x5_ioctl() from
-                          suggestion by <heiko@colossus.escape.de>
+      0.31    13-Jun-95   Fixed PCI stuff for 1.3.1.
+      0.32    26-Jun-95   Added verify_area() calls in de4x5_ioctl() from a
+                          suggestion by <heiko@colossus.escape.de>.
+      0.33     8-Aug-95   Add shared interrupt support (not released yet).
+      0.331   21-Aug-95   Fix de4x5_open() with fast CPUs.
+                          Fix de4x5_interrupt().
+                          Fix dc21140_autoconf() mess.
+			  No shared interrupt support.
+      0.332   11-Sep-95   Added MII management interface routines.
+      0.40     5-Mar-96   Fix setup frame timeout <maartenb@hpkuipc.cern.ch>.
+                          Add kernel timer code (h/w is too flaky).
+			  Add MII based PHY autosense.
+			  Add new multicasting code.
+			  Add new autosense algorithms for media/mode 
+			  selection using kernel scheduling/timing.
+			  Re-formatted.
+			  Made changes suggested by <jeff@router.patch.net>:
+			    Change driver to detect all DECchip based cards
+			    with DEC_ONLY restriction a special case.
+			    Changed driver to autprobe as a module. No irq
+			    checking is done now - assume BIOS is good!
+			  Added SMC9332 detection <manabe@Roy.dsl.tutics.ac.jp>
 
     =========================================================================
 */
 
-static const char *version = "de4x5.c:v0.32 6/26/95 davies@wanton.lkg.dec.com\n";
+static const char *version = "de4x5.c:v0.40 96/3/5 davies@wanton.lkg.dec.com\n";
 
 #include <linux/module.h>
 
@@ -171,6 +210,57 @@
 
 #include "de4x5.h"
 
+#define c_char const char
+
+/*
+** MII Information
+*/
+struct phy_table {
+    int reset;              /* Hard reset required? */
+    int id;                 /* IEEE OUI */
+    int ta;                 /* One cycle TA time - 802.3u is confusing here */
+    struct {                /* Non autonegotiation (parallel) speed det. */
+	int reg;
+	int mask;
+	int value;
+    } spd;
+};
+
+struct mii_phy {
+    int reset;              /* Hard reset required? */
+    int id;                 /* IEEE OUI */
+    int ta;                 /* One cycle TA time */
+    struct {                /* Non autonegotiation (parallel) speed det. */
+	int reg;
+	int mask;
+	int value;
+    } spd;
+    int addr;               /* MII address for the PHY */
+};
+
+#define DE4X5_MAX_PHY 8     /* Allow upto 8 attached PHY devices per board */
+
+/*
+** Define the know universe of PHY devices that can be
+** recognised by this driver
+*/
+static struct phy_table phy_info[] = {
+    {0, NATIONAL_TX, 1, {0x19, 0x40, 0x00}},   /* National TX */
+    {1, BROADCOM_T4, 1, {0x10, 0x02, 0x02}},   /* Broadcom T4 */
+    {0, SEEQ_T4    , 1, {0x12, 0x10, 0x10}},   /* SEEQ T4 */
+    {0, CYPRESS_T4 , 1, {0x05, 0x20, 0x20}}    /* Cypress T4 */
+};
+
+/*
+** Define special SROM detection cases
+*/
+static c_char enet_det[][ETH_ALEN] = {
+    {0x00, 0x00, 0x0c, 0x00, 0x00, 0x00}
+};
+
+#define SMC 1
+
+
 #ifdef DE4X5_DEBUG
 static int de4x5_debug = DE4X5_DEBUG;
 #else
@@ -182,6 +272,7 @@
 #else
 static int de4x5_autosense = AUTO;  /* Do auto media/mode sensing */
 #endif
+#define DE4X5_AUTOSENSE_MS 250      /* msec autosense tick (DE500) */
 
 #ifdef DE4X5_FULL_DUPLEX            /* Should be done on a per adapter basis */
 static s32 de4x5_full_duplex = 1;
@@ -209,27 +300,27 @@
 #define QUEUE_PKT_TIMEOUT (3*HZ)        /* 3 second timeout */
 
 
-#define CRC_POLYNOMIAL_BE 0x04c11db7UL   /* Ethernet CRC, big endian */
-#define CRC_POLYNOMIAL_LE 0xedb88320UL   /* Ethernet CRC, little endian */
+#define CRC_POLYNOMIAL_BE 0x04c11db7UL  /* Ethernet CRC, big endian */
+#define CRC_POLYNOMIAL_LE 0xedb88320UL  /* Ethernet CRC, little endian */
 
 /*
 ** EISA bus defines
 */
-#define DE4X5_EISA_IO_PORTS   0x0c00     /* I/O port base address, slot 0 */
-#define DE4X5_EISA_TOTAL_SIZE 0xfff      /* I/O address extent */
+#define DE4X5_EISA_IO_PORTS   0x0c00    /* I/O port base address, slot 0 */
+#define DE4X5_EISA_TOTAL_SIZE 0x100     /* I/O address extent */
 
 #define MAX_EISA_SLOTS 16
 #define EISA_SLOT_INC 0x1000
 
-#define DE4X5_SIGNATURE {"DE425",""}
+#define DE4X5_SIGNATURE {"DE425","DE434","DE435","DE450","DE500"}
 #define DE4X5_NAME_LENGTH 8
 
 /*
 ** PCI Bus defines
 */
-#define PCI_MAX_BUS_NUM 8
-#define DE4X5_PCI_TOTAL_SIZE 0x80        /* I/O address extent */
-#define DE4X5_CLASS_CODE     0x00020000  /* Network controller, Ethernet */
+#define PCI_MAX_BUS_NUM      8
+#define DE4X5_PCI_TOTAL_SIZE 0x80       /* I/O address extent */
+#define DE4X5_CLASS_CODE     0x00020000 /* Network controller, Ethernet */
 
 /*
 ** Memory Alignment. Each descriptor is 4 longwords long. To force a
@@ -237,23 +328,23 @@
 ** DESC_ALIGN. ALIGN aligns the start address of the private memory area
 ** and hence the RX descriptor ring's first entry. 
 */
-#define ALIGN4      ((u_long)4 - 1)    /* 1 longword align */
-#define ALIGN8      ((u_long)8 - 1)    /* 2 longword align */
-#define ALIGN16     ((u_long)16 - 1)   /* 4 longword align */
-#define ALIGN32     ((u_long)32 - 1)   /* 8 longword align */
-#define ALIGN64     ((u_long)64 - 1)   /* 16 longword align */
-#define ALIGN128    ((u_long)128 - 1)  /* 32 longword align */
+#define ALIGN4      ((u_long)4 - 1)     /* 1 longword align */
+#define ALIGN8      ((u_long)8 - 1)     /* 2 longword align */
+#define ALIGN16     ((u_long)16 - 1)    /* 4 longword align */
+#define ALIGN32     ((u_long)32 - 1)    /* 8 longword align */
+#define ALIGN64     ((u_long)64 - 1)    /* 16 longword align */
+#define ALIGN128    ((u_long)128 - 1)   /* 32 longword align */
 
-#define ALIGN         ALIGN32          /* Keep the DC21040 happy... */
+#define ALIGN         ALIGN32           /* Keep the DC21040 happy... */
 #define CACHE_ALIGN   CAL_16LONG
-#define DESC_SKIP_LEN DSL_0            /* Must agree with DESC_ALIGN */
-/*#define DESC_ALIGN    u32 dummy[4]; / * Must agree with DESC_SKIP_LEN */
+#define DESC_SKIP_LEN DSL_0             /* Must agree with DESC_ALIGN */
+/*#define DESC_ALIGN    u32 dummy[4];  / * Must agree with DESC_SKIP_LEN */
 #define DESC_ALIGN
 
-#ifndef IS_NOT_DEC                     /* See README.de4x5 for using this */
-static int is_not_dec = 0;
+#ifndef DEC_ONLY                        /* See README.de4x5 for using this */
+static int dec_only = 0;
 #else
-static int is_not_dec = 1;
+static int dec_only = 1;
 #endif
 
 /*
@@ -261,24 +352,24 @@
 */
 #define ENABLE_IRQs { \
     imr |= lp->irq_en;\
-    outl(imr, DE4X5_IMR);                   /* Enable the IRQs */\
+    outl(imr, DE4X5_IMR);               /* Enable the IRQs */\
 }
 
 #define DISABLE_IRQs {\
     imr = inl(DE4X5_IMR);\
     imr &= ~lp->irq_en;\
-    outl(imr, DE4X5_IMR);                   /* Disable the IRQs */\
+    outl(imr, DE4X5_IMR);               /* Disable the IRQs */\
 }
 
 #define UNMASK_IRQs {\
     imr |= lp->irq_mask;\
-    outl(imr, DE4X5_IMR);                   /* Unmask the IRQs */\
+    outl(imr, DE4X5_IMR);               /* Unmask the IRQs */\
 }
 
 #define MASK_IRQs {\
     imr = inl(DE4X5_IMR);\
     imr &= ~lp->irq_mask;\
-    outl(imr, DE4X5_IMR);                   /* Mask the IRQs */\
+    outl(imr, DE4X5_IMR);               /* Mask the IRQs */\
 }
 
 /*
@@ -287,19 +378,19 @@
 #define START_DE4X5 {\
     omr = inl(DE4X5_OMR);\
     omr |= OMR_ST | OMR_SR;\
-    outl(omr, DE4X5_OMR);                   /* Enable the TX and/or RX */\
+    outl(omr, DE4X5_OMR);               /* Enable the TX and/or RX */\
 }
 
 #define STOP_DE4X5 {\
     omr = inl(DE4X5_OMR);\
     omr &= ~(OMR_ST|OMR_SR);\
-    outl(omr, DE4X5_OMR);                   /* Disable the TX and/or RX */ \
+    outl(omr, DE4X5_OMR);               /* Disable the TX and/or RX */ \
 }
 
 /*
 ** DE4X5 SIA RESET
 */
-#define RESET_SIA outl(0, DE4X5_SICR);      /* Reset SIA connectivity regs */
+#define RESET_SIA outl(0, DE4X5_SICR);  /* Reset SIA connectivity regs */
 
 /*
 ** DE500 AUTOSENSE TIMER INTERVAL (MILLISECS)
@@ -310,12 +401,16 @@
 ** SROM Structure
 */
 struct de4x5_srom {
-  char reserved[18];
-  char version;
-  char num_adapters;
-  char ieee_addr[6];
-  char info[100];
-  short chksum;
+    char sub_vendor_id[2];
+    char sub_system_id[2];
+    char reserved[12];
+    char id_block_crc;
+    char reserved2;
+    char version;
+    char num_adapters;
+    char ieee_addr[6];
+    char info[100];
+    short chksum;
 };
 
 /*
@@ -326,11 +421,11 @@
 ** is possible. 1536 showed better 'ttcp' performance. Take your pick. 32 TX
 ** descriptors are needed for machines with an ALPHA CPU.
 */
-#define NUM_RX_DESC 8                        /* Number of RX descriptors */
-#define NUM_TX_DESC 32                       /* Number of TX descriptors */
-#define BUFF_ALLOC_RETRIES 10                /* In case of memory shortage */
-#define RX_BUFF_SZ 1536                      /* Power of 2 for kmalloc and */
-                                             /* Multiple of 4 for DC21040 */
+#define NUM_RX_DESC 8                   /* Number of RX descriptors   */
+#define NUM_TX_DESC 32                  /* Number of TX descriptors   */
+#define RX_BUFF_SZ  1536                /* Power of 2 for kmalloc and */
+                                        /* Multiple of 4 for DC21040  */
+                                        /* Allows 512 byte alignment  */
 struct de4x5_desc {
     volatile s32 status;
     u32 des1;
@@ -343,42 +438,81 @@
 ** The DE4X5 private structure
 */
 #define DE4X5_PKT_STAT_SZ 16
-#define DE4X5_PKT_BIN_SZ  128                /* Should be >=100 unless you
-                                                increase DE4X5_PKT_STAT_SZ */
+#define DE4X5_PKT_BIN_SZ  128            /* Should be >=100 unless you
+                                            increase DE4X5_PKT_STAT_SZ */
 
 struct de4x5_private {
-    char adapter_name[80];                   /* Adapter name */
-    struct de4x5_desc rx_ring[NUM_RX_DESC];  /* RX descriptor ring */
-    struct de4x5_desc tx_ring[NUM_TX_DESC];  /* TX descriptor ring */
-    struct sk_buff *skb[NUM_TX_DESC];        /* TX skb for freeing when sent */
-    int rx_new, rx_old;                      /* RX descriptor ring pointers */
-    int tx_new, tx_old;                      /* TX descriptor ring pointers */
-    char setup_frame[SETUP_FRAME_LEN];       /* Holds MCA and PA info. */
-    struct enet_statistics stats;            /* Public stats */
+    char adapter_name[80];                  /* Adapter name                 */
+    struct de4x5_desc rx_ring[NUM_RX_DESC]; /* RX descriptor ring           */
+    struct de4x5_desc tx_ring[NUM_TX_DESC]; /* TX descriptor ring           */
+    struct sk_buff *skb[NUM_TX_DESC];       /* TX skb for freeing when sent */
+    int rx_new, rx_old;                     /* RX descriptor ring pointers  */
+    int tx_new, tx_old;                     /* TX descriptor ring pointers  */
+    char setup_frame[SETUP_FRAME_LEN];      /* Holds MCA and PA info.       */
+    char frame[64];                         /* Min sized packet for loopback*/
+    struct enet_statistics stats;           /* Public stats                 */
     struct {
-	u_int bins[DE4X5_PKT_STAT_SZ]; /* Private stats counters */
+	u_int bins[DE4X5_PKT_STAT_SZ];      /* Private stats counters       */
 	u_int unicast;
 	u_int multicast;
 	u_int broadcast;
 	u_int excessive_collisions;
 	u_int tx_underruns;
 	u_int excessive_underruns;
+	u_int rx_runt_frames;
+	u_int rx_collision;
+	u_int rx_dribble;
+	u_int rx_overflow;
     } pktStats;
     char rxRingSize;
     char txRingSize;
-    int  bus;                                /* EISA or PCI */
-    int  bus_num;                            /* PCI Bus number */
-    int  chipset;                            /* DC21040, DC21041 or DC21140 */
-    s32  irq_mask;                           /* Interrupt Mask (Enable) bits */
-    s32  irq_en;                             /* Summary interrupt bits */
-    int  media;                              /* Media (eg TP), mode (eg 100B)*/
-    int  linkProb;                           /* Possible Link Problem */
-    int  autosense;                          /* Allow/disallow autosensing */
-    int  tx_enable;                          /* Enable descriptor polling */
-    int  lostMedia;                          /* Possibly lost media */
-    int  setup_f;                            /* Setup frame filtering type */
+    int  bus;                               /* EISA or PCI                  */
+    int  bus_num;                           /* PCI Bus number               */
+    int  state;                             /* Adapter OPENED or CLOSED     */
+    int  chipset;                           /* DC21040, DC21041 or DC21140  */
+    s32  irq_mask;                          /* Interrupt Mask (Enable) bits */
+    s32  irq_en;                            /* Summary interrupt bits       */
+    int  media;                             /* Media (eg TP), mode (eg 100B)*/
+    int  c_media;                           /* Remember the last media conn */
+    int  linkOK;                            /* Link is OK                   */
+    int  autosense;                         /* Allow/disallow autosensing   */
+    int  tx_enable;                         /* Enable descriptor polling    */
+    int  lostMedia;                         /* Possibly lost media          */
+    int  setup_f;                           /* Setup frame filtering type   */
+    int  local_state;                       /* State within a 'media' state */
+    struct mii_phy phy[DE4X5_MAX_PHY];      /* List of attached PHY devices */
+    int  active;                            /* Index to active PHY device   */
+    int  mii_cnt;                           /* Number of attached PHY's     */
+    int  timeout;                           /* Scheduling counter           */
+    struct timer_list timer;                /* Timer info for kernel        */
+    int tmp;                                /* Temporary global per card    */
+    struct {
+	void *priv;                         /* Original kmalloc'd mem addr  */
+	void *buf;                          /* Original kmalloc'd mem addr  */
+	s32 csr0;                           /* Saved Bus Mode Register      */
+	s32 csr6;                           /* Saved Operating Mode Reg.    */
+	s32 csr7;                           /* Saved IRQ Mask Register      */
+	s32 csr13;                          /* Saved SIA Connectivity Reg.  */
+	s32 csr14;                          /* Saved SIA TX/RX Register     */
+	s32 csr15;                          /* Saved SIA General Register   */
+	int save_cnt;                       /* Flag if state already saved  */
+	struct sk_buff *skb;                /* Save the (re-ordered) skb's  */
+    } cache;
 };
 
+/*
+** Kludge to get around the fact that the CSR addresses have different
+** offsets in the PCI and EISA boards. Also note that the ethernet address
+** PROM is accessed differently.
+*/
+static struct bus_type {
+    int bus;
+    int bus_num;
+    int device;
+    int chipset;
+    struct de4x5_srom srom;
+    int autosense;
+} bus;
 
 /*
 ** The transmit ring full condition is described by the tx_old and tx_new
@@ -388,8 +522,8 @@
 **    tx_old+txRingSize = tx_new+1  Full ring  (wrapped condition)
 */
 #define TX_BUFFS_AVAIL ((lp->tx_old<=lp->tx_new)?\
-			 lp->tx_old+lp->txRingSize-lp->tx_new-1:\
-                         lp->tx_old               -lp->tx_new-1)
+			lp->tx_old+lp->txRingSize-lp->tx_new-1:\
+			lp->tx_old               -lp->tx_new-1)
 
 /*
 ** Public Functions
@@ -407,26 +541,45 @@
 */
 static int     de4x5_hw_init(struct device *dev, u_long iobase);
 static int     de4x5_init(struct device *dev);
+static int     de4x5_sw_reset(struct device *dev);
 static int     de4x5_rx(struct device *dev);
 static int     de4x5_tx(struct device *dev);
 static int     de4x5_ast(struct device *dev);
 
 static int     autoconf_media(struct device *dev);
 static void    create_packet(struct device *dev, char *frame, int len);
-static void    dce_us_delay(u32 usec);
-static void    dce_ms_delay(u32 msec);
+static void    de4x5_us_delay(u32 usec);
+static void    de4x5_ms_delay(u32 msec);
 static void    load_packet(struct device *dev, char *buf, u32 flags, struct sk_buff *skb);
-static void    dc21040_autoconf(struct device *dev);
-static void    dc21041_autoconf(struct device *dev);
-static void    dc21140_autoconf(struct device *dev);
+static int     dc21040_autoconf(struct device *dev);
+static int     dc21041_autoconf(struct device *dev);
+static int     dc21140m_autoconf(struct device *dev);
+static int     de4x5_suspect_state(struct device *dev, int timeout, int prev_state, int (*fn)(struct device *, int), int (*asfn)(struct device *));
+static int     dc21040_state(struct device *dev, int csr13, int csr14, int csr15, int timeout, int next_state, int suspect_state, int (*fn)(struct device *, int));
 static int     test_media(struct device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14, s32 csr15, s32 msec);
 /*static int     test_sym_link(struct device *dev, u32 msec);*/
-static int     ping_media(struct device *dev);
+static int     test_mii_reg(struct device *dev, int reg, int mask, int pol, long msec);
+static int     is_spd_100(struct device *dev);
+static int     is_100_up(struct device *dev);
+static int     is_10_up(struct device *dev);
+static int     is_anc_capable(struct device *dev);
+static int     ping_media(struct device *dev, int msec);
+static void    de4x5_save_skbs(struct device *dev);
+static void    de4x5_restore_skbs(struct device *dev);
+static void    de4x5_cache_state(struct device *dev, int flag);
+static void    de4x5_put_cache(struct device *dev, struct sk_buff *skb);
+static void    de4x5_putb_cache(struct device *dev, struct sk_buff *skb);
+static struct  sk_buff *de4x5_get_cache(struct device *dev);
+static void    de4x5_setup_intr(struct device *dev);
+static void    de4x5_init_connection(struct device *dev);
+static int     de4x5_reset_phy(struct device *dev);
 static void    reset_init_sia(struct device *dev, s32 sicr, s32 strr, s32 sigr);
 static int     test_ans(struct device *dev, s32 irqs, s32 irq_mask, s32 msec);
-static void    load_ms_timer(struct device *dev, u32 msec);
+static int     test_tp(struct device *dev, s32 msec);
 static int     EISA_signature(char *name, s32 eisa_id);
-static int     DevicePresent(u_long iobase);
+static int     PCI_signature(char *name, struct bus_type *lp);
+static void    DevicePresent(u_long iobase);
+static int     de4x5_bad_srom(struct bus_type *lp);
 static short   srom_rd(u_long address, u_char offset);
 static void    srom_latch(u_int command, u_long address);
 static void    srom_command(u_int command, u_long address);
@@ -435,6 +588,17 @@
 /*static void    srom_busy(u_int command, u_long address);*/
 static void    sendto_srom(u_int command, u_long addr);
 static int     getfrom_srom(u_long addr);
+static int     mii_rd(u_char phyreg, u_char phyaddr, u_long ioaddr);
+static void    mii_wr(int data, u_char phyreg, u_char phyaddr, u_long ioaddr);
+static int     mii_rdata(u_long ioaddr);
+static void    mii_wdata(int data, int len, u_long ioaddr);
+static void    mii_ta(u_long rw, u_long ioaddr);
+static int     mii_swap(int data, int len);
+static void    mii_address(u_char addr, u_long ioaddr);
+static void    sendto_mii(u32 command, int data, u_long ioaddr);
+static int     getfrom_mii(u32 command, u_long ioaddr);
+static int     mii_get_oui(u_char phyaddr, u_long ioaddr);
+static int     mii_get_phy(struct device *dev);
 static void    SetMulticastFilter(struct device *dev);
 static int     get_hw_addr(struct device *dev);
 
@@ -444,14 +608,20 @@
 static char    *build_setup_frame(struct device *dev, int mode);
 static void    disable_ast(struct device *dev);
 static void    enable_ast(struct device *dev, u32 time_out);
-static void    kick_tx(struct device *dev);
+static long    de4x5_switch_to_srl(struct device *dev);
+static long    de4x5_switch_to_mii(struct device *dev);
+static void    timeout(struct device *dev, void (*fn)(u_long data), u_long data, u_long msec);
+static void    de4x5_dbg_open(struct device *dev);
+static void    de4x5_dbg_mii(struct device *dev, int k);
+static void    de4x5_dbg_media(struct device *dev);
+static void    de4x5_dbg_srom(struct de4x5_srom *p);
+static int     de4x5_strncmp(char *a, char *b, int n);
 
 #ifdef MODULE
 int  init_module(void);
 void cleanup_module(void);
-static int autoprobed = 1, loading_module = 1;
+static int autoprobed = 0, loading_module = 1;
 # else
-static unsigned char de4x5_irq[] = {5,9,10,11};
 static int autoprobed = 0, loading_module = 0;
 #endif /* MODULE */
 
@@ -459,256 +629,224 @@
 static int num_de4x5s = 0, num_eth = 0;
 
 /*
-** Kludge to get around the fact that the CSR addresses have different
-** offsets in the PCI and EISA boards. Also note that the ethernet address
-** PROM is accessed differently.
-*/
-static struct bus_type {
-    int bus;
-    int bus_num;
-    int device;
-    int chipset;
-    struct de4x5_srom srom;
-    int autosense;
-} bus;
-
-/*
 ** Miscellaneous defines...
 */
 #define RESET_DE4X5 {\
     int i;\
     i=inl(DE4X5_BMR);\
-    dce_ms_delay(1);\
+    de4x5_ms_delay(1);\
     outl(i | BMR_SWR, DE4X5_BMR);\
-    dce_ms_delay(1);\
+    de4x5_ms_delay(1);\
     outl(i, DE4X5_BMR);\
-    dce_ms_delay(1);\
-    for (i=0;i<5;i++) {inl(DE4X5_BMR); dce_ms_delay(1);}\
-    dce_ms_delay(1);\
+    de4x5_ms_delay(1);\
+    for (i=0;i<5;i++) {inl(DE4X5_BMR); de4x5_ms_delay(1);}\
+    de4x5_ms_delay(1);\
 }
 
 
-
+/*
+** Autoprobing in modules is allowed here. See the top of the file for
+** more info. Until I fix (un)register_netdevice() we won't be able to use it
+** though.
+*/
 int de4x5_probe(struct device *dev)
 {
-  int tmp = num_de4x5s, status = -ENODEV;
-  u_long iobase = dev->base_addr;
-
-  if ((iobase == 0) && loading_module){
-    printk("Autoprobing is not supported when loading a module based driver.\n");
-    status = -EIO;
-  } else {
+    int tmp = num_de4x5s, status = -ENODEV;
+    u_long iobase = dev->base_addr;
+    
     eisa_probe(dev, iobase);
     pci_probe(dev, iobase);
-
+    
     if ((tmp == num_de4x5s) && (iobase != 0) && loading_module) {
-      printk("%s: de4x5_probe() cannot find device at 0x%04lx.\n", dev->name, 
-	                                                               iobase);
+	printk("%s: de4x5_probe() cannot find device at 0x%04lx.\n", dev->name, 
+	       iobase);
     }
-
+    
     /*
     ** Walk the device list to check that at least one device
     ** initialised OK
     */
     for (; (dev->priv == NULL) && (dev->next != NULL); dev = dev->next);
-
+    
     if (dev->priv) status = 0;
     if (iobase == 0) autoprobed = 1;
-  }
-
-  return status;
+    
+    return status;
 }
 
 static int
 de4x5_hw_init(struct device *dev, u_long iobase)
 {
-  struct bus_type *lp = &bus;
-  int tmpbus, tmpchs, i, j, status=0;
-  char *tmp;
-
-  /* Ensure we're not sleeping */
-  if (lp->chipset == DC21041) {
-    outl(0, PCI_CFDA);
-    dce_ms_delay(10);
-  }
-
-  RESET_DE4X5;
-
-  if ((inl(DE4X5_STS) & (STS_TS | STS_RS)) == 0) {
+    struct bus_type *lp = &bus;
+    int tmpbus, tmpchs, status=0;
+    int i, media = *((char *)&(lp->srom) + *((char *)&(lp->srom) + 19) * 3);
+    char *tmp;
+    
+    /* Ensure we're not sleeping */
+    if (lp->chipset == DC21041) {
+	outl(0, PCI_CFDA);
+	de4x5_ms_delay(10);
+    }
+    
+    RESET_DE4X5;
+    
+    if ((inl(DE4X5_STS) & (STS_TS | STS_RS)) != 0) {
+	return -ENXIO;                       /* Hardware could not reset */
+    }
+    
     /* 
     ** Now find out what kind of DC21040/DC21041/DC21140 board we have.
     */
     if (lp->bus == PCI) {
-      if (!is_not_dec) {
-	if ((lp->chipset == DC21040) || (lp->chipset == DC21041)) {
-	  strcpy(name, "DE435");
-	} else if (lp->chipset == DC21140) {
-	  strcpy(name, "DE500");                /* Must read the SROM here! */
-	}
-      } else {
-	strcpy(name, "UNKNOWN");
-      }
+	PCI_signature(name, lp);
     } else {
-      EISA_signature(name, EISA_ID0);
+	EISA_signature(name, EISA_ID0);
     }
-
-    if (*name != '\0') {                         /* found a board signature */
-      dev->base_addr = iobase;
-      if (lp->bus == EISA) {
+    
+    if (*name == '\0') {                     /* Not found a board signature */
+	return -ENXIO;
+    }
+    
+    dev->base_addr = iobase;
+    if (lp->bus == EISA) {
 	printk("%s: %s at %04lx (EISA slot %ld)", 
-	                        dev->name, name, iobase, ((iobase>>12)&0x0f));
-      } else {                                   /* PCI port address */
+	       dev->name, name, iobase, ((iobase>>12)&0x0f));
+    } else {                                 /* PCI port address */
 	printk("%s: %s at %04lx (PCI bus %d, device %d)", dev->name, name,
-	                                      iobase, lp->bus_num, lp->device);
-      }
-	
-      printk(", h/w address ");
-      status = get_hw_addr(dev);
-      for (i = 0; i < ETH_ALEN - 1; i++) {       /* get the ethernet addr. */
+	       iobase, lp->bus_num, lp->device);
+    }
+    
+    printk(", h/w address ");
+    status = get_hw_addr(dev);
+    for (i = 0; i < ETH_ALEN - 1; i++) {     /* get the ethernet addr. */
 	printk("%2.2x:", dev->dev_addr[i]);
-      }
-      printk("%2.2x,\n", dev->dev_addr[i]);
-      
-      tmpbus = lp->bus;
-      tmpchs = lp->chipset;
-
-      if (status == 0) {
+    }
+    printk("%2.2x,\n", dev->dev_addr[i]);
+    
+    tmpbus = lp->bus;
+    tmpchs = lp->chipset;
+    
+    if (status != 0) {
+	printk("      which has an Ethernet PROM CRC error.\n");
+	return -ENXIO;
+    } else {
 	struct de4x5_private *lp;
-
+	
 	/* 
 	** Reserve a section of kernel memory for the adapter
 	** private area and the TX/RX descriptor rings.
 	*/
 	dev->priv = (void *) kmalloc(sizeof(struct de4x5_private) + ALIGN, 
-				                                   GFP_KERNEL);
-	if (dev->priv == NULL)
-		return -ENOMEM;
+				     GFP_KERNEL);
+	if (dev->priv == NULL) {
+	    return -ENOMEM;
+	}
+	
 	/*
 	** Align to a longword boundary
 	*/
+	tmp = dev->priv;
 	dev->priv = (void *)(((u_long)dev->priv + ALIGN) & ~ALIGN);
 	lp = (struct de4x5_private *)dev->priv;
 	memset(dev->priv, 0, sizeof(struct de4x5_private));
 	lp->bus = tmpbus;
 	lp->chipset = tmpchs;
+	lp->cache.priv = tmp;
 
 	/*
-	** Choose autosensing
+	** Check for an MII interface
+	*/
+	if (media & MEDIA_MII) {                   /* MII interface? */
+	    if (!mii_get_phy(dev)) {
+		printk("%s: MII search failed, no device found when one was expected\n", dev->name);
+		return -ENXIO;
+	    }
+	} else {
+	    mii_get_phy(dev);                      /* Search the MII anyway! */
+	}
+	
+	/*
+	** Choose correct autosensing in case someone messed up
 	*/
 	if (de4x5_autosense & AUTO) {
-	  lp->autosense = AUTO;
+	    lp->autosense = AUTO;
 	} else {
-	  if (lp->chipset != DC21140) {
-	    if ((lp->chipset == DC21040) && (de4x5_autosense & TP_NW)) {
-	      de4x5_autosense = TP;
-	    }
-	    if ((lp->chipset == DC21041) && (de4x5_autosense & BNC_AUI)) {
-	      de4x5_autosense = BNC;
-	    }
-	    lp->autosense = de4x5_autosense & 0x001f;
-	  } else {
-	    lp->autosense = de4x5_autosense & 0x00c0;
-	  }
+	    if (lp->chipset != DC21140) {
+		if ((lp->chipset == DC21040) && (de4x5_autosense & TP_NW)) {
+		    de4x5_autosense = TP;
+		}
+		if ((lp->chipset == DC21041) && (de4x5_autosense & BNC_AUI)) {
+		    de4x5_autosense = BNC;
+		}
+		lp->autosense = de4x5_autosense & 0x001f;
+	    } else {
+		lp->autosense = de4x5_autosense & 0x00c0;
+	    }
 	}
-
+	
 	sprintf(lp->adapter_name,"%s (%s)", name, dev->name);
-	request_region(iobase, (lp->bus == PCI ? DE4X5_PCI_TOTAL_SIZE :
-			                         DE4X5_EISA_TOTAL_SIZE), 
-		                                 lp->adapter_name);
-
+	
 	/*
 	** Allocate contiguous receive buffers, long word aligned. 
-	** This could be a possible memory leak if the private area
-	** is ever hosed.
 	*/
-	for (tmp=NULL, j=0; (j<BUFF_ALLOC_RETRIES) && (tmp==NULL); j++) {
-	  if ((tmp = (void *)kmalloc(RX_BUFF_SZ * NUM_RX_DESC + ALIGN, 
-	       	  		                        GFP_KERNEL)) != NULL) {
+	if ((tmp = (void *)kmalloc(RX_BUFF_SZ * NUM_RX_DESC + ALIGN, 
+				   GFP_KERNEL)) != NULL) {
+	    lp->cache.buf = tmp;
 	    tmp = (char *)(((u_long) tmp + ALIGN) & ~ALIGN);
 	    for (i=0; i<NUM_RX_DESC; i++) {
-	      lp->rx_ring[i].status = 0;
-	      lp->rx_ring[i].des1 = RX_BUFF_SZ;
-	      lp->rx_ring[i].buf = virt_to_bus(tmp + i * RX_BUFF_SZ);
-	      lp->rx_ring[i].next = (u32)NULL;
+		lp->rx_ring[i].status = 0;
+		lp->rx_ring[i].des1 = RX_BUFF_SZ;
+		lp->rx_ring[i].buf = virt_to_bus(tmp + i * RX_BUFF_SZ);
+		lp->rx_ring[i].next = (u32)NULL;
 	    }
 	    barrier();
-	  }
-	}
-
-	if (tmp != NULL) {
-	  lp->rxRingSize = NUM_RX_DESC;
-	  lp->txRingSize = NUM_TX_DESC;
-	  
-	  /* Write the end of list marker to the descriptor lists */
-	  lp->rx_ring[lp->rxRingSize - 1].des1 |= RD_RER;
-	  lp->tx_ring[lp->txRingSize - 1].des1 |= TD_TER;
-
-	  /* Tell the adapter where the TX/RX rings are located. */
-	  outl(virt_to_bus(lp->rx_ring), DE4X5_RRBA);
-	  outl(virt_to_bus(lp->tx_ring), DE4X5_TRBA);
-
-	  /* Initialise the IRQ mask and Enable/Disable */
-	  lp->irq_mask = IMR_RIM | IMR_TIM | IMR_TUM ;
-	  lp->irq_en   = IMR_NIM | IMR_AIM;
-
-	  lp->tx_enable = TRUE;
-
-	  if (dev->irq < 2) {
-#ifndef MODULE
-	    unsigned char irqnum;
-	    s32 omr;
-	    autoirq_setup(0);
 	    
-	    omr = inl(DE4X5_OMR);
-	    outl(IMR_AIM|IMR_RUM, DE4X5_IMR); /* Unmask RUM interrupt */
-	    outl(OMR_SR | omr, DE4X5_OMR);    /* Start RX w/no descriptors */
+	    request_region(iobase, (lp->bus == PCI ? DE4X5_PCI_TOTAL_SIZE :
+				    DE4X5_EISA_TOTAL_SIZE), 
+			   lp->adapter_name);
+	    
+	    lp->rxRingSize = NUM_RX_DESC;
+	    lp->txRingSize = NUM_TX_DESC;
+	    
+	    /* Write the end of list marker to the descriptor lists */
+	    lp->rx_ring[lp->rxRingSize - 1].des1 |= RD_RER;
+	    lp->tx_ring[lp->txRingSize - 1].des1 |= TD_TER;
+	    
+	    /* Tell the adapter where the TX/RX rings are located. */
+	    outl(virt_to_bus(lp->rx_ring), DE4X5_RRBA);
+	    outl(virt_to_bus(lp->tx_ring), DE4X5_TRBA);
+	    
+	    /* Initialise the IRQ mask and Enable/Disable */
+	    lp->irq_mask = IMR_RIM | IMR_TIM | IMR_TUM ;
+	    lp->irq_en   = IMR_NIM | IMR_AIM;
 
-	    irqnum = autoirq_report(1);
-	    if (!irqnum) {
-	      printk("      and failed to detect IRQ line.\n");
-	      status = -ENXIO;
-	    } else {
-	      for (dev->irq=0,i=0; (i<sizeof(de4x5_irq)) && (!dev->irq); i++) {
-		if (irqnum == de4x5_irq[i]) {
-		  dev->irq = irqnum;
-		  printk("      and uses IRQ%d.\n", dev->irq);
-		}
-	      }
-		  
-	      if (!dev->irq) {
-		printk("      but incorrect IRQ line detected.\n");
-		status = -ENXIO;
-	      }
-	    }
-		
-	    outl(0, DE4X5_IMR);               /* Re-mask RUM interrupt */
+	    /* Create a loopback packet frame for later media probing */
+	    create_packet(dev, lp->frame, sizeof(lp->frame));
 
-#endif /* MODULE */
-	  } else {
-	    printk("      and requires IRQ%d (not probed).\n", dev->irq);
-	  }
-	} else {
-	  printk("%s: Kernel could not allocate RX buffer memory.\n", 
-		                                                    dev->name);
-	  status = -ENXIO;
-	}
-	if (status) release_region(iobase, (lp->bus == PCI ? 
-					             DE4X5_PCI_TOTAL_SIZE :
-			                             DE4X5_EISA_TOTAL_SIZE));
-      } else {
-	printk("      which has an Ethernet PROM CRC error.\n");
-	status = -ENXIO;
-      }
-    } else {
-      status = -ENXIO;
+	    /* Initialise the adapter state */
+	    lp->state = CLOSED;
+
+	    printk("      and requires IRQ%d (provided by %s).\n", dev->irq,
+		   ((lp->bus == PCI) ? "PCI BIOS" : "EISA CNFG"));
+	} else {
+	    printk("%s: Kernel could not allocate RX buffer memory.\n", dev->name);
+	}
+	if (status) {
+	    release_region(iobase, (lp->bus == PCI ? 
+				    DE4X5_PCI_TOTAL_SIZE :
+				    DE4X5_EISA_TOTAL_SIZE));
+	    if (lp->rx_ring[0].buf) {
+		kfree(bus_to_virt(lp->rx_ring[0].buf));
+	    }
+	    kfree(dev->priv);
+	    dev->priv = NULL;
+	    
+	    return -ENXIO;
+	}
     }
-  } else {
-    status = -ENXIO;
-  }
-  
-  if (!status) {
+    
     if (de4x5_debug > 0) {
-      printk(version);
+	printk(version);
     }
     
     /* The DE4X5-specific entries in the device structure. */
@@ -723,131 +861,70 @@
     
     /* Fill in the generic field of the device structure. */
     ether_setup(dev);
-
+    
     /* Let the adapter sleep to save power */
     if (lp->chipset == DC21041) {
-      outl(0, DE4X5_SICR);
-      outl(CFDA_PSM, PCI_CFDA);
-    }
-  } else {                            /* Incorrectly initialised hardware */
-    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-    if (lp) {
-      kfree_s(bus_to_virt(lp->rx_ring[0].buf),
-	                                    RX_BUFF_SZ * NUM_RX_DESC + ALIGN);
-    }
-    if (dev->priv) {
-      kfree_s(dev->priv, sizeof(struct de4x5_private) + ALIGN);
-      dev->priv = NULL;
+	outl(0, DE4X5_SICR);
+	outl(CFDA_PSM, PCI_CFDA);
     }
-  }
-
-  return status;
+    
+    return status;
 }
 
 
 static int
 de4x5_open(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  int i, status = 0;
-  s32 imr, omr, sts;
-
-  /*
-  ** Wake up the adapter
-  */
-  if (lp->chipset == DC21041) {
-    outl(0, PCI_CFDA);
-    dce_ms_delay(10);
-  }
-
-  if (request_irq(dev->irq, (void *)de4x5_interrupt, SA_SHIRQ, lp->adapter_name, dev)) {
-    printk("de4x5_open(): Requested IRQ%d is busy\n",dev->irq);
-    status = -EAGAIN;
-  } else {
-
-    irq2dev_map[dev->irq] = dev;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int status = 0;
+    s32 omr;
+    
+    /*
+    ** Wake up the adapter
+    */
+    if (lp->chipset == DC21041) {
+	outl(0, PCI_CFDA);
+	de4x5_ms_delay(10);
+    }
+    
+    lp->state = OPEN;
+    
     /* 
     ** Re-initialize the DE4X5... 
     */
     status = de4x5_init(dev);
-
-    if (de4x5_debug > 1){
-      printk("%s: de4x5 open with irq %d\n",dev->name,dev->irq);
-      printk("\tphysical address: ");
-      for (i=0;i<6;i++){
-	printk("%2.2x:",(short)dev->dev_addr[i]);
-      }
-      printk("\n");
-      printk("Descriptor head addresses:\n");
-      printk("\t0x%8.8lx  0x%8.8lx\n",(u_long)lp->rx_ring,(u_long)lp->tx_ring);
-      printk("Descriptor addresses:\nRX: ");
-      for (i=0;i<lp->rxRingSize-1;i++){
-	if (i < 3) {
-	  printk("0x%8.8lx  ",(u_long)&lp->rx_ring[i].status);
-	}
-      }
-      printk("...0x%8.8lx\n",(u_long)&lp->rx_ring[i].status);
-      printk("TX: ");
-      for (i=0;i<lp->txRingSize-1;i++){
-	if (i < 3) {
-	  printk("0x%8.8lx  ", (u_long)&lp->tx_ring[i].status);
-	}
-      }
-      printk("...0x%8.8lx\n", (u_long)&lp->tx_ring[i].status);
-      printk("Descriptor buffers:\nRX: ");
-      for (i=0;i<lp->rxRingSize-1;i++){
-	if (i < 3) {
-	  printk("0x%8.8x  ",lp->rx_ring[i].buf);
-	}
-      }
-      printk("...0x%8.8x\n",lp->rx_ring[i].buf);
-      printk("TX: ");
-      for (i=0;i<lp->txRingSize-1;i++){
-	if (i < 3) {
-	  printk("0x%8.8x  ", lp->tx_ring[i].buf);
-	}
-      }
-      printk("...0x%8.8x\n", lp->tx_ring[i].buf);
-      printk("Ring size: \nRX: %d\nTX: %d\n", 
-	     (short)lp->rxRingSize, 
-	     (short)lp->txRingSize); 
-      printk("\tstatus:  %d\n", status);
-    }
-
-    if (!status) {
-      dev->tbusy = 0;                         
-      dev->start = 1;
-      dev->interrupt = UNMASK_INTERRUPTS;
-      dev->trans_start = jiffies;
-
-      START_DE4X5;
-
-      /* Unmask and enable DE4X5 board interrupts */
-      imr = 0;
-      UNMASK_IRQs;
-
-      /* Reset any pending (stale) interrupts */
-      sts = inl(DE4X5_STS);
-      outl(sts, DE4X5_STS);
-
-      ENABLE_IRQs;
+    
+    de4x5_dbg_open(dev);
+    
+    if (request_irq(dev->irq, (void *)de4x5_interrupt, 0, lp->adapter_name, dev)) {
+	printk("de4x5_open(): Requested IRQ%d is busy\n",dev->irq);
+	status = -EAGAIN;
+    } else {
+	dev->tbusy = 0;                         
+	dev->start = 1;
+	dev->interrupt = UNMASK_INTERRUPTS;
+	dev->trans_start = jiffies;
+	
+	START_DE4X5;
+	
+	de4x5_setup_intr(dev);
     }
+    
     if (de4x5_debug > 1) {
-      printk("\tsts:  0x%08x\n", inl(DE4X5_STS));
-      printk("\tbmr:  0x%08x\n", inl(DE4X5_BMR));
-      printk("\timr:  0x%08x\n", inl(DE4X5_IMR));
-      printk("\tomr:  0x%08x\n", inl(DE4X5_OMR));
-      printk("\tsisr: 0x%08x\n", inl(DE4X5_SISR));
-      printk("\tsicr: 0x%08x\n", inl(DE4X5_SICR));
-      printk("\tstrr: 0x%08x\n", inl(DE4X5_STRR));
-      printk("\tsigr: 0x%08x\n", inl(DE4X5_SIGR));
+	printk("\tsts:  0x%08x\n", inl(DE4X5_STS));
+	printk("\tbmr:  0x%08x\n", inl(DE4X5_BMR));
+	printk("\timr:  0x%08x\n", inl(DE4X5_IMR));
+	printk("\tomr:  0x%08x\n", inl(DE4X5_OMR));
+	printk("\tsisr: 0x%08x\n", inl(DE4X5_SISR));
+	printk("\tsicr: 0x%08x\n", inl(DE4X5_SICR));
+	printk("\tstrr: 0x%08x\n", inl(DE4X5_STRR));
+	printk("\tsigr: 0x%08x\n", inl(DE4X5_SIGR));
     }
-  }
-
-  MOD_INC_USE_COUNT;
-
-  return status;
+    
+    MOD_INC_USE_COUNT;
+    
+    return status;
 }
 
 /*
@@ -861,74 +938,91 @@
 static int
 de4x5_init(struct device *dev)
 {  
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  int i, j, status = 0;
-  s32 bmr, omr;
-
-  /* Lock out other processes whilst setting up the hardware */
-  set_bit(0, (void *)&dev->tbusy);
-
-  RESET_DE4X5;
-
-  bmr = inl(DE4X5_BMR);
-  bmr |= PBL_8 | DESC_SKIP_LEN | CACHE_ALIGN;
-  outl(bmr, DE4X5_BMR);
-
-  if (lp->chipset != DC21140) {
-    omr = TR_96;
-    lp->setup_f = HASH_PERF;
-  } else {
-    omr = OMR_SDP | OMR_SF;
-    lp->setup_f = PERFECT;
-  }
-  outl(virt_to_bus(lp->rx_ring), DE4X5_RRBA);
-  outl(virt_to_bus(lp->tx_ring), DE4X5_TRBA);
-
-  lp->rx_new = lp->rx_old = 0;
-  lp->tx_new = lp->tx_old = 0;
-
-  for (i = 0; i < lp->rxRingSize; i++) {
-    lp->rx_ring[i].status = R_OWN;
-  }
-
-  for (i = 0; i < lp->txRingSize; i++) {
-    lp->tx_ring[i].status = 0;
-  }
-
-  barrier();
-
-  /* Build the setup frame depending on filtering mode */
-  SetMulticastFilter(dev);
-
-  if (lp->chipset != DC21140) {
-    load_packet(dev, lp->setup_frame, HASH_F|TD_SET|SETUP_FRAME_LEN, NULL);
-  } else {
-    load_packet(dev, lp->setup_frame, PERFECT_F|TD_SET|SETUP_FRAME_LEN, NULL);
-  }
-  outl(omr|OMR_ST, DE4X5_OMR);
-
-  /* Poll for completion of setup frame (interrupts are disabled for now) */
-  for (j=0, i=jiffies;(i<=jiffies+HZ/100) && (j==0);) {
-    if (lp->tx_ring[lp->tx_new].status >= 0) j=1;
-  }
-  outl(omr, DE4X5_OMR);                        /* Stop everything! */
-
-  if (j == 0) {
-    printk("%s: Setup frame timed out, status %08x\n", dev->name, 
-	                                                       inl(DE4X5_STS));
-    status = -EIO;
-  }
-
-  lp->tx_new = (++lp->tx_new) % lp->txRingSize;
-  lp->tx_old = lp->tx_new;
-
-  /* Autoconfigure the connected port */
-  if (autoconf_media(dev) == 0) {
-    status = -EIO;
-  }
+    /* Lock out other processes whilst setting up the hardware */
+    set_bit(0, (void *)&dev->tbusy);
+    
+    de4x5_sw_reset(dev);
+    
+    /* Autoconfigure the connected port */
+    autoconf_media(dev);
+    
+    return 0;
+}
 
-  return 0;
+static int de4x5_sw_reset(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int i, j, status = 0;
+    s32 bmr, omr;
+    
+    /* Select the MII or SRL port now and RESET the MAC */
+    if (lp->phy[lp->active].id == 0) {
+	de4x5_switch_to_srl(dev);
+    } else {
+	de4x5_switch_to_mii(dev);
+    }
+    
+    /* 
+    ** Set the programmable burst length to 8 longwords for all the DC21140
+    ** Fasternet chips and 4 longwords for all others: DMA errors result
+    ** without these values. Cache align 16 long.
+    */
+    bmr = (lp->chipset==DC21140 ? PBL_8 : PBL_4) | DESC_SKIP_LEN | CACHE_ALIGN;
+    outl(bmr, DE4X5_BMR);
+    
+    omr = inl(DE4X5_OMR) & ~OMR_PR;             /* Turn of promiscuous mode */
+    if (lp->chipset != DC21140) {
+	omr |= TR_96;
+	lp->setup_f = HASH_PERF;
+    } else {
+	omr |= OMR_SDP | OMR_SB | (!lp->phy[lp->active].id ? OMR_SF : 0);
+	lp->setup_f = PERFECT;
+    }
+    outl(virt_to_bus(lp->rx_ring), DE4X5_RRBA);
+    outl(virt_to_bus(lp->tx_ring), DE4X5_TRBA);
+    
+    lp->rx_new = lp->rx_old = 0;
+    lp->tx_new = lp->tx_old = 0;
+    
+    for (i = 0; i < lp->rxRingSize; i++) {
+	lp->rx_ring[i].status = R_OWN;
+    }
+    
+    for (i = 0; i < lp->txRingSize; i++) {
+	lp->tx_ring[i].status = 0;
+    }
+    
+    barrier();
+    
+    /* Build the setup frame depending on filtering mode */
+    SetMulticastFilter(dev);
+    
+    if (lp->chipset != DC21140) {
+	load_packet(dev, lp->setup_frame, HASH_F|TD_SET|SETUP_FRAME_LEN, NULL);
+    } else {
+	load_packet(dev, lp->setup_frame, PERFECT_F|TD_SET|SETUP_FRAME_LEN, NULL);
+    }
+    outl(omr|OMR_ST, DE4X5_OMR);
+    
+    /* Poll for setup frame completion (adapter interrupts are disabled now) */
+    sti();                                       /* Ensure timer interrupts */
+    for (j=0, i=0;(i<500) && (j==0);i++) {       /* Upto 500ms delay */
+	udelay(1000);
+	if (lp->tx_ring[lp->tx_new].status >= 0) j=1;
+    }
+    outl(omr, DE4X5_OMR);                        /* Stop everything! */
+    
+    if (j == 0) {
+	printk("%s: Setup frame timed out, status %08x\n", dev->name, 
+	       inl(DE4X5_STS));
+	status = -EIO;
+    }
+    
+    lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+    lp->tx_old = lp->tx_new;
+    
+    return status;
 }
 
 /* 
@@ -937,120 +1031,71 @@
 static int
 de4x5_queue_pkt(struct sk_buff *skb, struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  int i, status = 0;
-  s32 imr, omr, sts;
-
-  /*
-  ** Clean out the TX ring asynchronously to interrupts - sometimes the
-  ** interrupts are lost by delayed descriptor status updates relative to
-  ** the irq assertion, especially with a busy PCI bus.
-  */
-  if (set_bit(0, (void*)&dev->tbusy) == 0) {
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int status = 0;
+    
+    if (skb == NULL) {
+	dev_tint(dev);
+	return 0;
+    }
+
+    if (lp->tx_enable == NO) {                   /* Cannot send for now */
+	de4x5_put_cache(dev, skb);               /* Queue the buffer locally */
+	return 0;                                
+    }
+    
+    /*
+    ** Clean out the TX ring asynchronously to interrupts - sometimes the
+    ** interrupts are lost by delayed descriptor status updates relative to
+    ** the irq assertion, especially with a busy PCI bus.
+    */
+    set_bit(0, (void*)&dev->tbusy);
     cli();
     de4x5_tx(dev);
-    dev->tbusy = 0;
     sti();
-  }
-  
-  /* 
-  ** Transmitter timeout, possibly serious problems.
-  ** The 'lostMedia' threshold accounts for transient errors that
-  ** were noticed when switching media.
-  */
-  if (dev->tbusy || (lp->lostMedia > LOST_MEDIA_THRESHOLD)) {
-    u_long tickssofar = jiffies - dev->trans_start;
-    if ((tickssofar < QUEUE_PKT_TIMEOUT) &&
-	(lp->lostMedia <= LOST_MEDIA_THRESHOLD)) {
-      status = -1;
-    } else {
-      if (de4x5_debug >= 1) {
-	printk("%s: transmit timed out, status %08x, tbusy:%ld, lostMedia:%d tickssofar:%ld, resetting.\n",dev->name, inl(DE4X5_STS), dev->tbusy, lp->lostMedia, tickssofar);
-      }
-
-      /* Stop and reset the TX and RX... */
-      STOP_DE4X5;
-
-      /* Re-queue any skb's. */
-      for (i=lp->tx_old; i!=lp->tx_new; i=(++i)%lp->txRingSize) {
-	if (lp->skb[i] != NULL) {
-	  if (lp->skb[i]->len != FAKE_FRAME_LEN) {
-	    if (lp->tx_ring[i].status == T_OWN) {
-	      dev_queue_xmit(lp->skb[i], dev, SOPRI_NORMAL);
-	    } else {                               /* already sent */
-	      dev_kfree_skb(lp->skb[i], FREE_WRITE);
-	    }
-	  } else {
-	    dev_kfree_skb(lp->skb[i], FREE_WRITE);
-	  }
-	  lp->skb[i] = NULL;
-	}
-      }
-      if (skb->len != FAKE_FRAME_LEN) {
-	dev_queue_xmit(skb, dev, SOPRI_NORMAL);
-      } else {
-	dev_kfree_skb(skb, FREE_WRITE);
-      }
-
-      /* Initialise the hardware */
-      status = de4x5_init(dev);
-
-      /* Unmask DE4X5 board interrupts */
-      if (!status) {
-	/* Start here to clean stale interrupts later */
-	dev->interrupt = UNMASK_INTERRUPTS;
-	dev->start = 1;
-	dev->tbusy = 0;                         
-	dev->trans_start = jiffies;
-      
-	START_DE4X5;
-
-	/* Unmask DE4X5 board interrupts */
-	imr = 0;
-	UNMASK_IRQs;
-
-	/* Clear any pending (stale) interrupts */
-	sts = inl(DE4X5_STS);
-	outl(sts, DE4X5_STS);
-
-	ENABLE_IRQs;
-      } else {
-	printk("%s: hardware initialisation failure, status %08x.\n",
-	                                            dev->name, inl(DE4X5_STS));
-      }
-    }
-  } else if (skb == NULL) {
-    dev_tint(dev);
-  } else if (skb->len == FAKE_FRAME_LEN) {     /* Don't TX a fake frame! */
-    dev_kfree_skb(skb, FREE_WRITE);
-  } else if (skb->len > 0) {
-    /* Enforce 1 process per h/w access */
-    if (set_bit(0, (void*)&dev->tbusy) != 0) { 
-      printk("%s: Transmitter access conflict.\n", dev->name);
-      status = -1;                             /* Re-queue packet */
-    } else {
-      cli();
-      if (TX_BUFFS_AVAIL) {                    /* Fill in a Tx ring entry */
-	load_packet(dev, skb->data, TD_IC | TD_LS | TD_FS | skb->len, skb);
-	if (lp->tx_enable) {
-	  outl(POLL_DEMAND, DE4X5_TPD);        /* Start the TX */
+    
+    /* Transmit descriptor ring full or stale skb */
+    if (dev->tbusy || lp->skb[lp->tx_new]) {
+	if (dev->interrupt) {
+	    de4x5_putb_cache(dev, skb);          /* Requeue the buffer */
+	} else {
+	    de4x5_put_cache(dev, skb);
 	}
-
-	lp->tx_new = (++lp->tx_new) % lp->txRingSize; /* Ensure a wrap */
-	dev->trans_start = jiffies;
-
-	if (TX_BUFFS_AVAIL) {
-	  dev->tbusy = 0;                      /* Another pkt may be queued */
+	if (de4x5_debug > 1) {
+	    printk("%s: transmit busy, lost media or stale skb found:\n  STS:%08x\n  tbusy:%ld\n  lostMedia:%d\n  IMR:%08x\n  OMR:%08x\n Stale skb: %s\n",dev->name, inl(DE4X5_STS), dev->tbusy, lp->lostMedia, inl(DE4X5_IMR), inl(DE4X5_OMR), (lp->skb[lp->tx_new] ? "YES" : "NO"));
+	}
+    } else if (skb->len > 0) {
+	/* If we already have stuff queued locally, use that first */
+	if (lp->cache.skb && !dev->interrupt) {
+	    de4x5_put_cache(dev, skb);
+	    skb = de4x5_get_cache(dev);
+	}
+
+	while (skb && !dev->tbusy && !lp->skb[lp->tx_new]) {
+	    set_bit(0, (void*)&dev->tbusy);
+	    cli();
+	    if (TX_BUFFS_AVAIL) {           /* Fill in a Tx ring entry */
+		load_packet(dev, skb->data, 
+			    TD_IC | TD_LS | TD_FS | skb->len, skb);
+		outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */
+		
+		lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+		dev->trans_start = jiffies;
+		    
+		if (TX_BUFFS_AVAIL) {
+		    dev->tbusy = 0;         /* Another pkt may be queued */
+		}
+		skb = de4x5_get_cache(dev);
+	    }
+	    sti();
+	}
+	if (skb && (dev->tbusy || lp->skb[lp->tx_new])) {
+	    de4x5_putb_cache(dev, skb);
 	}
-      } else {                                 /* Ring full - re-queue */
-	status = -1;
-      }
-      sti();
     }
-  }
-
-  return status;
+    
+    return status;
 }
 
 /*
@@ -1071,144 +1116,150 @@
     struct de4x5_private *lp;
     s32 imr, omr, sts;
     u_long iobase;
-
+    
     if (dev == NULL) {
 	printk ("de4x5_interrupt(): irq %d for unknown device.\n", irq);
-    } else {
-      lp = (struct de4x5_private *)dev->priv;
-      iobase = dev->base_addr;
-
-      if (dev->interrupt)
-	printk("%s: Re-entering the interrupt handler.\n", dev->name);
-
-      DISABLE_IRQs;                      /* Ensure non re-entrancy */
-      dev->interrupt = MASK_INTERRUPTS;
-
-      while ((sts = inl(DE4X5_STS)) & lp->irq_mask) { /* Read IRQ status */
+	return;
+    }
+    lp = (struct de4x5_private *)dev->priv;
+    iobase = dev->base_addr;
+	
+    if (dev->interrupt)
+      printk("%s: Re-entering the interrupt handler.\n", dev->name);
+	
+    DISABLE_IRQs;                        /* Ensure non re-entrancy */
+    dev->interrupt = MASK_INTERRUPTS;
+	
+    for (;;) {
+	sts = inl(DE4X5_STS);            /* Read IRQ status */
 	outl(sts, DE4X5_STS);            /* Reset the board interrupts */
-
-	if (sts & (STS_RI | STS_RU))	 /* Rx interrupt (packet[s] arrived) */
+	    
+	if (!(sts & lp->irq_mask)) break;/* All done */
+	    
+	if (sts & (STS_RI | STS_RU))     /* Rx interrupt (packet[s] arrived) */
 	  de4x5_rx(dev);
-
+	    
 	if (sts & (STS_TI | STS_TU))     /* Tx interrupt (packet sent) */
 	  de4x5_tx(dev); 
-
-	if (sts & STS_TM)                /* Autosense tick */
-	  de4x5_ast(dev);
-
+	    
 	if (sts & STS_LNF) {             /* TP Link has failed */
-	  lp->lostMedia = LOST_MEDIA_THRESHOLD + 1;
-	  lp->irq_mask &= ~IMR_LFM;
-	  kick_tx(dev);
+	    lp->lostMedia = LOST_MEDIA_THRESHOLD + 1;
+	    lp->irq_mask &= ~IMR_LFM;
 	}
-
+	    
 	if (sts & STS_SE) {              /* Bus Error */
-	  STOP_DE4X5;
-	  printk("%s: Fatal bus error occured, sts=%#8x, device stopped.\n",
-	                                                      dev->name, sts);
+	    STOP_DE4X5;
+	    printk("%s: Fatal bus error occured, sts=%#8x, device stopped.\n",
+		   dev->name, sts);
+	    return;
 	}
-      }
-
-      if (TX_BUFFS_AVAIL && dev->tbusy) {/* Any resources available? */
-	dev->tbusy = 0;                  /* Clear TX busy flag */
-	mark_bh(NET_BH);
-      }
+    }
 
-      dev->interrupt = UNMASK_INTERRUPTS;
-      ENABLE_IRQs;
+    /* Load the TX ring with any locally stored packets */
+    while (lp->cache.skb && !dev->tbusy && lp->tx_enable) {
+	de4x5_queue_pkt(de4x5_get_cache(dev), dev);
     }
 
+    dev->interrupt = UNMASK_INTERRUPTS;
+    ENABLE_IRQs;
+    
     return;
 }
 
 static int
 de4x5_rx(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  int i, entry;
-  s32 status;
-  char *buf;
-
-  for (entry = lp->rx_new; lp->rx_ring[entry].status >= 0;entry = lp->rx_new) {
-    status = lp->rx_ring[entry].status;
-
-    if (status & RD_FS) {                   /* Remember the start of frame */
-      lp->rx_old = entry;
-    }
-
-    if (status & RD_LS) {                   /* Valid frame status */
-      if (status & RD_ES) {	            /* There was an error. */
-	lp->stats.rx_errors++;              /* Update the error stats. */
-	if (status & (RD_RF | RD_TL)) lp->stats.rx_frame_errors++;
-	if (status & RD_CE)           lp->stats.rx_crc_errors++;
-	if (status & RD_OF)           lp->stats.rx_fifo_errors++;
-      } else {                              /* A valid frame received */
-	struct sk_buff *skb;
-	short pkt_len = (short)(lp->rx_ring[entry].status >> 16) - 4;
-
-	if ((skb = dev_alloc_skb(pkt_len+2)) != NULL) {
-	  skb->dev = dev;
-	
-	  skb_reserve(skb,2);		/* Align */
-	  if (entry < lp->rx_old) {         /* Wrapped buffer */
-	    short len = (lp->rxRingSize - lp->rx_old) * RX_BUFF_SZ;
-	    memcpy(skb_put(skb,len), bus_to_virt(lp->rx_ring[lp->rx_old].buf), len);
-	    memcpy(skb_put(skb,pkt_len-len), bus_to_virt(lp->rx_ring[0].buf), pkt_len - len);
-	  } else {                          /* Linear buffer */
-	    memcpy(skb_put(skb,pkt_len), bus_to_virt(lp->rx_ring[lp->rx_old].buf), pkt_len);
-	  }
-
-	  /* Push up the protocol stack */
-	  skb->protocol=eth_type_trans(skb,dev);
-	  netif_rx(skb);
-
-	  /* Update stats */
-	  lp->stats.rx_packets++;
-	  for (i=1; i<DE4X5_PKT_STAT_SZ-1; i++) {
-	    if (pkt_len < (i*DE4X5_PKT_BIN_SZ)) {
-	      lp->pktStats.bins[i]++;
-	      i = DE4X5_PKT_STAT_SZ;
-	    }
-	  }
-	  buf = skb->data;                  /* Look at the dest addr */
-	  if (buf[0] & 0x01) {              /* Multicast/Broadcast */
-	    if ((*(s32 *)&buf[0] == -1) && (*(s16 *)&buf[4] == -1)) {
-	      lp->pktStats.broadcast++;
-	    } else {
-	      lp->pktStats.multicast++;
-	    }
-	  } else if ((*(s32 *)&buf[0] == *(s32 *)&dev->dev_addr[0]) &&
-		     (*(s16 *)&buf[4] == *(s16 *)&dev->dev_addr[4])) {
-	    lp->pktStats.unicast++;
-	  }
-	  
-	  lp->pktStats.bins[0]++;           /* Duplicates stats.rx_packets */
-	  if (lp->pktStats.bins[0] == 0) {  /* Reset counters */
-	    memset((char *)&lp->pktStats, 0, sizeof(lp->pktStats));
-	  }
-	} else {
-	  printk("%s: Insufficient memory; nuking packet.\n", dev->name);
-	  lp->stats.rx_dropped++;	      /* Really, deferred. */
-	  break;
-	}
-      }
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int i, entry;
+    s32 status;
+    char *buf;
+    
+    for (entry=lp->rx_new; lp->rx_ring[entry].status>=0;entry=lp->rx_new) {
+	status = lp->rx_ring[entry].status;
+	
+	if (status & RD_FS) {                 /* Remember the start of frame */
+	    lp->rx_old = entry;
+	}
+	
+	if (status & RD_LS) {                 /* Valid frame status */
+	    lp->linkOK++;
+	    if (status & RD_ES) {	      /* There was an error. */
+		lp->stats.rx_errors++;        /* Update the error stats. */
+		if (status & (RD_RF | RD_TL)) lp->stats.rx_frame_errors++;
+		if (status & RD_CE)           lp->stats.rx_crc_errors++;
+		if (status & RD_OF)           lp->stats.rx_fifo_errors++;
+		if (status & RD_TL)           lp->stats.rx_length_errors++;
+		if (status & RD_RF)           lp->pktStats.rx_runt_frames++;
+		if (status & RD_CS)           lp->pktStats.rx_collision++;
+		if (status & RD_DB)           lp->pktStats.rx_dribble++;
+		if (status & RD_OF)           lp->pktStats.rx_overflow++;
+	    } else {                          /* A valid frame received */
+		struct sk_buff *skb;
+		short pkt_len = (short)(lp->rx_ring[entry].status >> 16) - 4;
+		
+		if ((skb = dev_alloc_skb(pkt_len+2)) == NULL) {
+		    printk("%s: Insufficient memory; nuking packet.\n", 
+			                                            dev->name);
+		    lp->stats.rx_dropped++;   /* Really, deferred. */
+		    break;
+		}
 
-      /* Change buffer ownership for this last frame, back to the adapter */
-      for (; lp->rx_old!=entry; lp->rx_old=(++lp->rx_old)%lp->rxRingSize) {
-	lp->rx_ring[lp->rx_old].status = R_OWN;
-	barrier();
-      }
-      lp->rx_ring[entry].status = R_OWN;
-      barrier();
+		skb->dev = dev;
+		skb_reserve(skb,2);	      /* Align */
+		if (entry < lp->rx_old) {     /* Wrapped buffer */
+		    short len = (lp->rxRingSize - lp->rx_old) * RX_BUFF_SZ;
+		    memcpy(skb_put(skb,len), bus_to_virt(lp->rx_ring[lp->rx_old].buf), len);
+		    memcpy(skb_put(skb,pkt_len-len), bus_to_virt(lp->rx_ring[0].buf), pkt_len - len);
+		} else {                      /* Linear buffer */
+		    memcpy(skb_put(skb,pkt_len), bus_to_virt(lp->rx_ring[lp->rx_old].buf), pkt_len);
+		}
+		    
+		/* Push up the protocol stack */
+		skb->protocol=eth_type_trans(skb,dev);
+		netif_rx(skb);
+		    
+		/* Update stats */
+		lp->stats.rx_packets++;
+		for (i=1; i<DE4X5_PKT_STAT_SZ-1; i++) {
+		    if (pkt_len < (i*DE4X5_PKT_BIN_SZ)) {
+			lp->pktStats.bins[i]++;
+			i = DE4X5_PKT_STAT_SZ;
+		    }
+		}
+		buf = skb->data;              /* Look at the dest addr */
+		if (buf[0] & 0x01) {          /* Multicast/Broadcast */
+		    if ((*(s32 *)&buf[0] == -1) && (*(s16 *)&buf[4] == -1)) {
+			lp->pktStats.broadcast++;
+		    } else {
+			lp->pktStats.multicast++;
+		    }
+		} else if ((*(s32 *)&buf[0] == *(s32 *)&dev->dev_addr[0]) &&
+			   (*(s16 *)&buf[4] == *(s16 *)&dev->dev_addr[4])) {
+		    lp->pktStats.unicast++;
+		}
+		
+		lp->pktStats.bins[0]++;       /* Duplicates stats.rx_packets */
+		if (lp->pktStats.bins[0] == 0) { /* Reset counters */
+		    memset((char *)&lp->pktStats, 0, sizeof(lp->pktStats));
+		}
+	    }
+	    
+	    /* Change buffer ownership for this frame, back to the adapter */
+	    for (;lp->rx_old!=entry;lp->rx_old=(++lp->rx_old)%lp->rxRingSize) {
+		lp->rx_ring[lp->rx_old].status = R_OWN;
+		barrier();
+	    }
+	    lp->rx_ring[entry].status = R_OWN;
+	    barrier();
+	}
+	
+	/*
+	** Update entry information
+	*/
+	lp->rx_new = (++lp->rx_new) % lp->rxRingSize;
     }
-
-    /*
-    ** Update entry information
-    */
-    lp->rx_new = (++lp->rx_new) % lp->rxRingSize;
-  }
-
-  return 0;
+    
+    return 0;
 }
 
 /*
@@ -1217,200 +1268,172 @@
 static int
 de4x5_tx(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  int entry;
-  s32 status;
-
-  for (entry = lp->tx_old; entry != lp->tx_new; entry = lp->tx_old) {
-    status = lp->tx_ring[entry].status;
-    if (status < 0) {                            /* Buffer not sent yet */
-      break;
-    } else if (status & TD_ES) {                 /* An error happened */
-      lp->stats.tx_errors++; 
-      if (status & TD_NC)  lp->stats.tx_carrier_errors++;
-      if (status & TD_LC)  lp->stats.tx_window_errors++;
-      if (status & TD_UF)  lp->stats.tx_fifo_errors++;
-      if (status & TD_LC)  lp->stats.collisions++;
-      if (status & TD_EC)  lp->pktStats.excessive_collisions++;
-      if (status & TD_DE)  lp->stats.tx_aborted_errors++;
-
-      if ((status != 0x7fffffff) &&              /* Not setup frame */
-	  (status & (TD_LO | TD_NC | TD_EC | TD_LF))) {
-	lp->lostMedia++;
-	if (lp->lostMedia > LOST_MEDIA_THRESHOLD) { /* Trip autosense */
-	  kick_tx(dev);
-	}
-      } else {
-	outl(POLL_DEMAND, DE4X5_TPD);            /* Restart a stalled TX */
-      }
-    } else {                                     /* Packet sent */
-      lp->stats.tx_packets++;
-      lp->lostMedia = 0;                         /* Remove transient problem */
-    }
-    /* Free the buffer if it's not a setup frame. */
-    if (lp->skb[entry] != NULL) {
-      dev_kfree_skb(lp->skb[entry], FREE_WRITE);
-      lp->skb[entry] = NULL;
-    }
-
-    /* Update all the pointers */
-    lp->tx_old = (++lp->tx_old) % lp->txRingSize;
-  }
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int entry;
+    s32 status;
+    
+    for (entry = lp->tx_old; entry != lp->tx_new; entry = lp->tx_old) {
+	status = lp->tx_ring[entry].status;
+	if (status < 0) {                     /* Buffer not sent yet */
+	    break;
+	} else if (status & TD_ES) {          /* An error happened */
+	    lp->stats.tx_errors++; 
+	    if (status & TD_NC)  lp->stats.tx_carrier_errors++;
+	    if (status & TD_LC)  lp->stats.tx_window_errors++;
+	    if (status & TD_UF)  lp->stats.tx_fifo_errors++;
+	    if (status & TD_LC)  lp->stats.collisions++;
+	    if (status & TD_EC)  lp->pktStats.excessive_collisions++;
+	    if (status & TD_DE)  lp->stats.tx_aborted_errors++;
+	    
+	    if ((status != 0x7fffffff) &&     /* Not setup frame */
+		(status & (TD_LO | TD_NC | TD_EC | TD_LF))) {
+		lp->lostMedia++;
+	    } else {
+		outl(POLL_DEMAND, DE4X5_TPD); /* Restart a stalled TX */
+	    }
+	} else {                              /* Packet sent */
+	    lp->stats.tx_packets++;
+	    lp->lostMedia = 0;                /* Remove transient problem */
+	}
+	/* Free the buffer if it's not a setup frame. */
+	if (lp->skb[entry] != NULL) {
+	    dev_kfree_skb(lp->skb[entry], FREE_WRITE);
+	    lp->skb[entry] = NULL;
+	}
+	
+	/* Update all the pointers */
+	lp->tx_old = (++lp->tx_old) % lp->txRingSize;
+    }
 
-  return 0;
+    if (TX_BUFFS_AVAIL && dev->tbusy) {  /* Any resources available? */
+	dev->tbusy = 0;                  /* Clear TX busy flag */
+	if (dev->interrupt) mark_bh(NET_BH);
+    }
+	
+    return 0;
 }
 
 static int
 de4x5_ast(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  s32 gep;
-
-  disable_ast(dev);
-
-  if (lp->chipset == DC21140) {
-    gep = inl(DE4X5_GEP);
-    if (((lp->media == _100Mb) &&  (gep & GEP_SLNK)) ||
-	((lp->media == _10Mb)  &&  (gep & GEP_LNP))  ||
-	((lp->media == _10Mb)  && !(gep & GEP_SLNK)) ||
-	 (lp->media == NC)) {
-      if (lp->linkProb || ((lp->media == NC) && (!(gep & GEP_LNP)))) {
-	lp->lostMedia = LOST_MEDIA_THRESHOLD + 1;
-	lp->linkProb = 0;
-	kick_tx(dev);
-      } else {
-	switch(lp->media) {
-	case NC:
-	  lp->linkProb = 0;
-	  enable_ast(dev, DE4X5_AUTOSENSE_MS);
-	  break;
-
-	case _10Mb:
-	  lp->linkProb = 1;                    /* Flag a potential problem */
-	  enable_ast(dev, 1500);
-	  break;
-
-	case _100Mb:
-	  lp->linkProb = 1;                    /* Flag a potential problem */
-	  enable_ast(dev, 4000);
-	  break;
-	}
-      }
-    } else {
-      lp->linkProb = 0;                        /* Link OK */
-      enable_ast(dev, DE4X5_AUTOSENSE_MS);
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int next_tick = DE4X5_AUTOSENSE_MS;
+    
+    disable_ast(dev);
+    
+    if (lp->chipset == DC21140) {
+	next_tick = dc21140m_autoconf(dev);
+    } else if (lp->chipset == DC21041) {
+	next_tick = dc21041_autoconf(dev);
+    } else if (lp->chipset == DC21040) {
+	next_tick = dc21040_autoconf(dev);
     }
-  }
-
-  return 0;
+    lp->linkOK = 0;
+    enable_ast(dev, next_tick);
+    
+    return 0;
 }
 
 static int
 de4x5_close(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  s32 imr, omr;
-
-  dev->start = 0;
-  dev->tbusy = 1;
-
-  if (de4x5_debug > 1) {
-    printk("%s: Shutting down ethercard, status was %8.8x.\n",
-	   dev->name, inl(DE4X5_STS));
-  }
-
-  /* 
-  ** We stop the DE4X5 here... mask interrupts and stop TX & RX
-  */
-  DISABLE_IRQs;
-
-  STOP_DE4X5;
-
-  /*
-  ** Free the associated irq
-  */
-  free_irq(dev->irq, dev);
-  irq2dev_map[dev->irq] = 0;
-
-  MOD_DEC_USE_COUNT;
-
-  /* Put the adapter to sleep to save power */
-  if (lp->chipset == DC21041) {
-    outl(0, DE4X5_SICR);
-    outl(CFDA_PSM, PCI_CFDA);
-  }
-
-  return 0;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    s32 imr, omr;
+    
+    disable_ast(dev);
+    dev->start = 0;
+    dev->tbusy = 1;
+    
+    if (de4x5_debug > 1) {
+	printk("%s: Shutting down ethercard, status was %8.8x.\n",
+	       dev->name, inl(DE4X5_STS));
+    }
+    
+    /* 
+    ** We stop the DE4X5 here... mask interrupts and stop TX & RX
+    */
+    DISABLE_IRQs;
+    
+    STOP_DE4X5;
+    
+    /*
+    ** Free the associated irq
+    */
+    free_irq(dev->irq, dev);
+    lp->state = CLOSED;
+    
+    MOD_DEC_USE_COUNT;
+    
+    /* Put the adapter to sleep to save power */
+    if (lp->chipset == DC21041) {
+	outl(0, DE4X5_SICR);
+	outl(CFDA_PSM, PCI_CFDA);
+    }
+    
+    return 0;
 }
 
 static struct enet_statistics *
 de4x5_get_stats(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-
-  lp->stats.rx_missed_errors = (int) (inl(DE4X5_MFC) & (MFC_OVFL | MFC_CNTR));
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
     
-  return &lp->stats;
+    lp->stats.rx_missed_errors = (int)(inl(DE4X5_MFC) & (MFC_OVFL | MFC_CNTR));
+    
+    return &lp->stats;
 }
 
 static void load_packet(struct device *dev, char *buf, u32 flags, struct sk_buff *skb)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-
-  lp->tx_ring[lp->tx_new].buf = virt_to_bus(buf);
-  lp->tx_ring[lp->tx_new].des1 &= TD_TER;
-  lp->tx_ring[lp->tx_new].des1 |= flags;
-  lp->skb[lp->tx_new] = skb;
-  barrier();
-  lp->tx_ring[lp->tx_new].status = T_OWN;
-  barrier();
-
-  return;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    
+    lp->tx_ring[lp->tx_new].buf = virt_to_bus(buf);
+    lp->tx_ring[lp->tx_new].des1 &= TD_TER;
+    lp->tx_ring[lp->tx_new].des1 |= flags;
+    lp->skb[lp->tx_new] = skb;
+    barrier();
+    lp->tx_ring[lp->tx_new].status = T_OWN;
+    barrier();
+    
+    return;
 }
+
 /*
 ** Set or clear the multicast filter for this adaptor.
-** num_addrs == -1	Promiscuous mode, receive all packets - now supported.
-**                      Can also use the ioctls.
-** num_addrs == 0	Normal mode, clear multicast list
-** num_addrs > 0	Multicast mode, receive normal and MC packets, and do
-** 			best-effort filtering.
-** num_addrs == HASH_TABLE_LEN
-**	                Set all multicast bits (pass all multicasts).
 */
 static void
 set_multicast_list(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-
-  /* First, double check that the adapter is open */
-  if (irq2dev_map[dev->irq] != NULL) {
-    if (dev->flags & IFF_PROMISC) {         /* set promiscuous mode */
-      u32 omr;
-      omr = inl(DE4X5_OMR);
-      omr |= OMR_PR;
-      outl(omr, DE4X5_OMR);
-    } else { 
-      SetMulticastFilter(dev);
-      if (lp->setup_f == HASH_PERF) {
-	load_packet(dev, lp->setup_frame, TD_IC | HASH_F | TD_SET | 
-		                                        SETUP_FRAME_LEN, NULL);
-      } else {
-	load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET | 
-		                                        SETUP_FRAME_LEN, NULL);
-      }
-      
-      lp->tx_new = (++lp->tx_new) % lp->txRingSize;
-      outl(POLL_DEMAND, DE4X5_TPD);                /* Start the TX */
-      dev->trans_start = jiffies;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    
+    /* First, double check that the adapter is open */
+    if (lp->state == OPEN) {
+	if (dev->flags & IFF_PROMISC) {         /* set promiscuous mode */
+	    u32 omr;
+	    omr = inl(DE4X5_OMR);
+	    omr |= OMR_PR;
+	    outl(omr, DE4X5_OMR);
+	} else { 
+	    SetMulticastFilter(dev);
+	    if (lp->setup_f == HASH_PERF) {
+		load_packet(dev, lp->setup_frame, TD_IC | HASH_F | TD_SET | 
+			    SETUP_FRAME_LEN, NULL);
+	    } else {
+		load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET | 
+			    SETUP_FRAME_LEN, NULL);
+	    }
+	    
+	    lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+	    outl(POLL_DEMAND, DE4X5_TPD);       /* Start the TX */
+	    dev->trans_start = jiffies;
+	}
     }
-  }
-
-  return;
+    
+    return;
 }
 
 /*
@@ -1420,59 +1443,58 @@
 */
 static void SetMulticastFilter(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  struct dev_mc_list *dmi=dev->mc_list;
-  u_long iobase = dev->base_addr;
-  int i, j, bit, byte;
-  u16 hashcode;
-  u32 omr, crc, poly = CRC_POLYNOMIAL_LE;
-  char *pa;
-  unsigned char *addrs;
-
-  omr = inl(DE4X5_OMR);
-  omr &= ~OMR_PR;
-  pa = build_setup_frame(dev, ALL);          /* Build the basic frame */
-
-  if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 14)) {
-    omr |= OMR_PM;                           /* Pass all multicasts */
-  } else if (lp->setup_f == HASH_PERF) {
-                                             /* Now update the MCA table */
-    for (i=0;i<dev->mc_count;i++) {          /* for each address in the list */
-      addrs=dmi->dmi_addr;
-      dmi=dmi->next;
-      if ((*addrs & 0x01) == 1) {            /* multicast address? */ 
-	crc = 0xffffffff;                    /* init CRC for each address */
-	for (byte=0;byte<ETH_ALEN;byte++) {  /* for each address byte */
-	                                     /* process each address bit */ 
-	  for (bit = *addrs++,j=0;j<8;j++, bit>>=1) {
-	    crc = (crc >> 1) ^ (((crc ^ bit) & 0x01) ? poly : 0);
-	  }
-	}
-	hashcode = crc & HASH_BITS;          /* hashcode is 9 LSb of CRC */
-	
-	byte = hashcode >> 3;                /* bit[3-8] -> byte in filter */
-	bit = 1 << (hashcode & 0x07);        /* bit[0-2] -> bit in byte */
-	
-	byte <<= 1;                          /* calc offset into setup frame */
-	if (byte & 0x02) {
-	  byte -= 1;
-	}
-	lp->setup_frame[byte] |= bit;
-      }
-    }
-  } else {                                   /* Perfect filtering */
-    for (j=0; j<dev->mc_count; j++) {
-      addrs=dmi->dmi_addr;
-      dmi=dmi->next;
-      for (i=0; i<ETH_ALEN; i++) { 
-	*(pa + (i&1)) = *addrs++;
-	if (i & 0x01) pa += 4;
-      }
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    struct dev_mc_list *dmi=dev->mc_list;
+    u_long iobase = dev->base_addr;
+    int i, j, bit, byte;
+    u16 hashcode;
+    u32 omr, crc, poly = CRC_POLYNOMIAL_LE;
+    char *pa;
+    unsigned char *addrs;
+    
+    omr = inl(DE4X5_OMR);
+    omr &= ~(OMR_PR | OMR_PM);
+    pa = build_setup_frame(dev, ALL);        /* Build the basic frame */
+    
+    if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 14)) {
+	omr |= OMR_PM;                       /* Pass all multicasts */
+    } else if (lp->setup_f == HASH_PERF) {   /* Hash Filtering */
+	for (i=0;i<dev->mc_count;i++) {      /* for each address in the list */
+	    addrs=dmi->dmi_addr;
+	    dmi=dmi->next;
+	    if ((*addrs & 0x01) == 1) {      /* multicast address? */ 
+		crc = 0xffffffff;            /* init CRC for each address */
+		for (byte=0;byte<ETH_ALEN;byte++) {/* for each address byte */
+		                             /* process each address bit */ 
+		    for (bit = *addrs++,j=0;j<8;j++, bit>>=1) {
+			crc = (crc >> 1) ^ (((crc ^ bit) & 0x01) ? poly : 0);
+		    }
+		}
+		hashcode = crc & HASH_BITS;  /* hashcode is 9 LSb of CRC */
+		
+		byte = hashcode >> 3;        /* bit[3-8] -> byte in filter */
+		bit = 1 << (hashcode & 0x07);/* bit[0-2] -> bit in byte */
+		
+		byte <<= 1;                  /* calc offset into setup frame */
+		if (byte & 0x02) {
+		    byte -= 1;
+		}
+		lp->setup_frame[byte] |= bit;
+	    }
+	}
+    } else {                                 /* Perfect filtering */
+	for (j=0; j<dev->mc_count; j++) {
+	    addrs=dmi->dmi_addr;
+	    dmi=dmi->next;
+	    for (i=0; i<ETH_ALEN; i++) { 
+		*(pa + (i&1)) = *addrs++;
+		if (i & 0x01) pa += 4;
+	    }
+	}
     }
-  }
-  outl(omr, DE4X5_OMR);
-
-  return;
+    outl(omr, DE4X5_OMR);
+    
+    return;
 }
 
 /*
@@ -1481,57 +1503,54 @@
 */
 static void eisa_probe(struct device *dev, u_long ioaddr)
 {
-  int i, maxSlots, status;
-  u_short vendor, device;
-  s32 cfid;
-  u_long iobase;
-  struct bus_type *lp = &bus;
-  char name[DE4X5_STRLEN];
-
-  if (!ioaddr && autoprobed) return ;            /* Been here before ! */
-  if ((ioaddr < 0x1000) && (ioaddr > 0)) return; /* PCI MODULE special */
-
-  lp->bus = EISA;
-
-  if (ioaddr == 0) {                     /* Autoprobing */
-    iobase = EISA_SLOT_INC;              /* Get the first slot address */
-    i = 1;
-    maxSlots = MAX_EISA_SLOTS;
-  } else {                               /* Probe a specific location */
-    iobase = ioaddr;
-    i = (ioaddr >> 12);
-    maxSlots = i + 1;
-  }
-
-  for (status = -ENODEV; (i<maxSlots) && (dev!=NULL); i++, iobase+=EISA_SLOT_INC) {
-    if (EISA_signature(name, EISA_ID)) {
-      cfid = inl(PCI_CFID);
-      device = (u_short)(cfid >> 16);
-      vendor = (u_short) cfid;
-
-      lp->bus = EISA;
-      lp->chipset = device;
-      if (DevicePresent(EISA_APROM) == 0) { 
-	/* Write the PCI Configuration Registers */
-	outl(PCI_COMMAND_IO | PCI_COMMAND_MASTER, PCI_CFCS);
-	outl(0x00004000, PCI_CFLT);
-	outl(iobase, PCI_CBIO);
-
-	if (check_region(iobase, DE4X5_EISA_TOTAL_SIZE) == 0) {
-	  if ((dev = alloc_device(dev, iobase)) != NULL) {
-	    if ((status = de4x5_hw_init(dev, iobase)) == 0) {
-	      num_de4x5s++;
-	    }
-	    num_eth++;
-	  }
-	} else if (autoprobed) {
-	  printk("%s: region already allocated at 0x%04lx.\n", dev->name, iobase);
+    int i, maxSlots, status;
+    u_short vendor, device;
+    s32 cfid;
+    u_long iobase;
+    struct bus_type *lp = &bus;
+    char name[DE4X5_STRLEN];
+    
+    if (!ioaddr && autoprobed) return;     /* Been here before ! */
+    
+    lp->bus = EISA;
+    
+    if (ioaddr == 0) {                     /* Autoprobing */
+	iobase = EISA_SLOT_INC;            /* Get the first slot address */
+	i = 1;
+	maxSlots = MAX_EISA_SLOTS;
+    } else {                               /* Probe a specific location */
+	iobase = ioaddr;
+	i = (ioaddr >> 12);
+	maxSlots = i + 1;
+    }
+    
+    for (status = -ENODEV; (i<maxSlots) && (dev!=NULL); i++, iobase+=EISA_SLOT_INC) {
+	if (EISA_signature(name, EISA_ID)) {
+	    cfid = inl(PCI_CFID);
+	    device = (u_short)(cfid >> 16);
+	    vendor = (u_short) cfid;
+	    
+	    lp->chipset = device;
+	    DevicePresent(EISA_APROM);
+	    /* Write the PCI Configuration Registers */
+	    outl(PCI_COMMAND_IO | PCI_COMMAND_MASTER, PCI_CFCS);
+	    outl(0x00004000, PCI_CFLT);
+	    outl(iobase, PCI_CBIO);
+	    
+	    if (check_region(iobase, DE4X5_EISA_TOTAL_SIZE) == 0) {
+		if ((dev = alloc_device(dev, iobase)) != NULL) {
+		    if ((status = de4x5_hw_init(dev, iobase)) == 0) {
+			num_de4x5s++;
+		    }
+		    num_eth++;
+		}
+	    } else if (autoprobed) {
+		printk("%s: region already allocated at 0x%04lx.\n", dev->name,iobase);
+	    }
 	}
-      }
     }
-  }
-
-  return;
+    
+    return;
 }
 
 /*
@@ -1551,79 +1570,80 @@
 
 static void pci_probe(struct device *dev, u_long ioaddr)
 {
-  u_char irq;
-  u_char pb, pbus, dev_num, dnum, dev_fn;
-  u_short vendor, device, index, status;
-  u_int class = DE4X5_CLASS_CODE;
-  u_int iobase;
-  struct bus_type *lp = &bus;
-
-  if (!ioaddr && autoprobed) return ;        /* Been here before ! */
-
-  if (pcibios_present()) {
+    u_char irq;
+    u_char pb, pbus, dev_num, dnum, dev_fn;
+    u_short vendor, device, index, status;
+    u_int class = DE4X5_CLASS_CODE;
+    u_int iobase;
+    struct bus_type *lp = &bus;
+    
+    if (!ioaddr && autoprobed) return;       /* Been here before ! */
+    
+    if (!pcibios_present()) return;          /* No PCI bus in this machine! */
+    
     lp->bus = PCI;
-
+    
     if (ioaddr < 0x1000) {
-      pbus = (u_short)(ioaddr >> 8);
-      dnum = (u_short)(ioaddr & 0xff);
+	pbus = (u_short)(ioaddr >> 8);
+	dnum = (u_short)(ioaddr & 0xff);
     } else {
-      pbus = 0;
-      dnum = 0;
+	pbus = 0;
+	dnum = 0;
     }
     
     for (index=0; 
 	 (pcibios_find_class(class, index, &pb, &dev_fn)!= PCIBIOS_DEVICE_NOT_FOUND);
 	 index++) {
-      dev_num = PCI_SLOT(dev_fn);
-
-      if ((!pbus && !dnum) || ((pbus == pb) && (dnum == dev_num))) {
-	pcibios_read_config_word(pb, PCI_DEVICE, PCI_VENDOR_ID, &vendor);
-	pcibios_read_config_word(pb, PCI_DEVICE, PCI_DEVICE_ID, &device);
-	if (is_DC21040 || is_DC21041 || is_DC21140) {
-	  /* Set the device number information */
-	  lp->device = dev_num;
-	  lp->bus_num = pb;
-
-	  /* Set the chipset information */
-	  lp->chipset = device;
-
-	  /* Get the board I/O address */
-	  pcibios_read_config_dword(pb, PCI_DEVICE, PCI_BASE_ADDRESS_0, &iobase);
-	  iobase &= CBIO_MASK;
-
-	  /* Fetch the IRQ to be used */
-	  pcibios_read_config_byte(pb, PCI_DEVICE, PCI_INTERRUPT_LINE, &irq);
-
-	  /* Check if I/O accesses and Bus Mastering are enabled */
-	  pcibios_read_config_word(pb, PCI_DEVICE, PCI_COMMAND, &status);
-	  if (status & PCI_COMMAND_IO) {
+	dev_num = PCI_SLOT(dev_fn);
+	
+	if ((!pbus && !dnum) || ((pbus == pb) && (dnum == dev_num))) {
+	    pcibios_read_config_word(pb, PCI_DEVICE, PCI_VENDOR_ID, &vendor);
+	    pcibios_read_config_word(pb, PCI_DEVICE, PCI_DEVICE_ID, &device);
+	    if (!(is_DC21040 || is_DC21041 || is_DC21140)) continue;
+	    
+	    /* Set the device number information */
+	    lp->device = dev_num;
+	    lp->bus_num = pb;
+	    
+	    /* Set the chipset information */
+	    lp->chipset = device;
+	    
+	    /* Get the board I/O address */
+	    pcibios_read_config_dword(pb, PCI_DEVICE, PCI_BASE_ADDRESS_0, &iobase);
+	    iobase &= CBIO_MASK;
+	    
+	    /* Fetch the IRQ to be used */
+	    pcibios_read_config_byte(pb, PCI_DEVICE, PCI_INTERRUPT_LINE, &irq);
+	    if ((irq == 0) || (irq == (u_char) 0xff)) continue;
+	    
+	    /* Check if I/O accesses and Bus Mastering are enabled */
+	    pcibios_read_config_word(pb, PCI_DEVICE, PCI_COMMAND, &status);
+	    if (!(status & PCI_COMMAND_IO)) continue;
+	    
 	    if (!(status & PCI_COMMAND_MASTER)) {
-	      status |= PCI_COMMAND_MASTER;
-	      pcibios_write_config_word(pb, PCI_DEVICE, PCI_COMMAND, status);
-	      pcibios_read_config_word(pb, PCI_DEVICE, PCI_COMMAND, &status);
-	    }
-	    if (status & PCI_COMMAND_MASTER) {
-	      if ((DevicePresent(DE4X5_APROM) == 0) || is_not_dec) {
-		if (check_region(iobase, DE4X5_PCI_TOTAL_SIZE) == 0) {
-		  if ((dev = alloc_device(dev, iobase)) != NULL) {
+		status |= PCI_COMMAND_MASTER;
+		pcibios_write_config_word(pb, PCI_DEVICE, PCI_COMMAND, status);
+		pcibios_read_config_word(pb, PCI_DEVICE, PCI_COMMAND, &status);
+	    }
+	    if (!(status & PCI_COMMAND_MASTER)) continue;
+	    
+	    DevicePresent(DE4X5_APROM);
+	    if (check_region(iobase, DE4X5_PCI_TOTAL_SIZE) == 0) {
+		if ((dev = alloc_device(dev, iobase)) != NULL) {
 		    dev->irq = irq;
 		    if ((status = de4x5_hw_init(dev, iobase)) == 0) {
-		      num_de4x5s++;
+			num_de4x5s++;
 		    }
 		    num_eth++;
-		  }
-		} else if (autoprobed) {
-		  printk("%s: region already allocated at 0x%04x.\n", dev->name, (u_short)iobase);
 		}
-	      }
+	    } else if (autoprobed) {
+		printk("%s: region already allocated at 0x%04x.\n", dev->name, 
+		       (u_short)iobase);
 	    }
-	  }
 	}
-      }
     }
-  }
-
-  return;
+    
+    return;
 }
 
 /*
@@ -1632,536 +1652,1103 @@
 */
 static struct device *alloc_device(struct device *dev, u_long iobase)
 {
-  int addAutoProbe = 0;
-  struct device *tmp = NULL, *ret;
-  int (*init)(struct device *) = NULL;
-
-  /*
-  ** Check the device structures for an end of list or unused device
-  */
-  if (!loading_module) {
+    int addAutoProbe = 0;
+    struct device *tmp = NULL, *ret;
+    int (*init)(struct device *) = NULL;
+    
+    if (loading_module) return dev;
+    
+    /*
+    ** Check the device structures for an end of list or unused device
+    */
     while (dev->next != NULL) {
-      if ((dev->base_addr == DE4X5_NDA) || (dev->base_addr == 0)) break;
-      dev = dev->next;                     /* walk through eth device list */
-      num_eth++;                           /* increment eth device number */
+	if ((dev->base_addr == DE4X5_NDA) || (dev->base_addr == 0)) break;
+	dev = dev->next;                   /* walk through eth device list */
+	num_eth++;                         /* increment eth device number */
     }
-
+    
     /*
     ** If an autoprobe is requested for another device, we must re-insert
     ** the request later in the list. Remember the current position first.
     */
     if ((dev->base_addr == 0) && (num_de4x5s > 0)) {
-      addAutoProbe++;
-      tmp = dev->next;                     /* point to the next device */
-      init = dev->init;                    /* remember the probe function */
+	addAutoProbe++;
+	tmp = dev->next;                   /* point to the next device */
+	init = dev->init;                  /* remember the probe function */
     }
-
+    
     /*
     ** If at end of list and can't use current entry, malloc one up. 
     ** If memory could not be allocated, print an error message.
     */
     if ((dev->next == NULL) &&  
-	!((dev->base_addr == DE4X5_NDA) || (dev->base_addr == 0))){
-      dev->next = (struct device *)kmalloc(sizeof(struct device) + 8,
-					   GFP_KERNEL);
-
-      dev = dev->next;                     /* point to the new device */
-      if (dev == NULL) {
-	printk("eth%d: Device not initialised, insufficient memory\n",
-	       num_eth);
-      } else {
-	/*
-	** If the memory was allocated, point to the new memory area
-	** and initialize it (name, I/O address, next device (NULL) and
-	** initialisation probe routine).
-	*/
-	dev->name = (char *)(dev + sizeof(struct device));
-	if (num_eth > 9999) {
-	  sprintf(dev->name,"eth????");    /* New device name */
-	} else {
-	  sprintf(dev->name,"eth%d", num_eth);/* New device name */
-	}
-	dev->base_addr = iobase;           /* assign the io address */
-	dev->next = NULL;                  /* mark the end of list */
-	dev->init = &de4x5_probe;          /* initialisation routine */
-	num_de4x5s++;
-      }
+	!((dev->base_addr == DE4X5_NDA) || (dev->base_addr == 0))) {
+	dev->next = (struct device *)kmalloc(sizeof(struct device)+8, GFP_KERNEL);
+	dev = dev->next;                   /* point to the new device */
+	if (dev == NULL) {
+	    printk("eth%d: Device not initialised, insufficient memory\n", num_eth);
+	} else {
+	    /*
+	    ** If the memory was allocated, point to the new memory area
+	    ** and initialize it (name, I/O address, next device (NULL) and
+	    ** initialisation probe routine).
+	    */
+	    dev->name = (char *)(dev + sizeof(struct device));
+	    if (num_eth > 9999) {
+		sprintf(dev->name,"eth????");/* New device name */
+	    } else {
+		sprintf(dev->name,"eth%d", num_eth);/* New device name */
+	    }
+	    dev->base_addr = iobase;       /* assign the io address */
+	    dev->next = NULL;              /* mark the end of list */
+	    dev->init = &de4x5_probe;      /* initialisation routine */
+	    num_de4x5s++;
+	}
     }
     ret = dev;                             /* return current struct, or NULL */
-  
+     
     /*
     ** Now figure out what to do with the autoprobe that has to be inserted.
     ** Firstly, search the (possibly altered) list for an empty space.
     */
     if (ret != NULL) {
-      if (addAutoProbe) {
-	for (; (tmp->next!=NULL) && (tmp->base_addr!=DE4X5_NDA); tmp=tmp->next);
-
-	/*
-	** If no more device structures and can't use the current one, malloc
-	** one up. If memory could not be allocated, print an error message.
-	*/
-	if ((tmp->next == NULL) && !(tmp->base_addr == DE4X5_NDA)) {
-	  tmp->next = (struct device *)kmalloc(sizeof(struct device) + 8,
-					       GFP_KERNEL);
-	  tmp = tmp->next;                     /* point to the new device */
-	  if (tmp == NULL) {
-	    printk("%s: Insufficient memory to extend the device list.\n", 
-		   dev->name);
-	  } else {
+	if (addAutoProbe) {
+	    for (; (tmp->next!=NULL) && (tmp->base_addr!=DE4X5_NDA); tmp=tmp->next);
 	    /*
-	    ** If the memory was allocated, point to the new memory area
-	    ** and initialize it (name, I/O address, next device (NULL) and
-	    ** initialisation probe routine).
+	    ** If no more device structures and can't use the current one, 
+	    ** malloc one up. If memory could not be allocated, print an error
+	    **message.
 	    */
-	    tmp->name = (char *)(tmp + sizeof(struct device));
-	    if (num_eth > 9999) {
-	      sprintf(tmp->name,"eth????");       /* New device name */
-	    } else {
-	      sprintf(tmp->name,"eth%d", num_eth);/* New device name */
+	    if ((tmp->next == NULL) && !(tmp->base_addr == DE4X5_NDA)) {
+		tmp->next = (struct device *)kmalloc(sizeof(struct device) + 8,
+						     GFP_KERNEL);
+		tmp = tmp->next;           /* point to the new device */
+		if (tmp == NULL) {
+		    printk("%s: Insufficient memory to extend the device list.\n", 
+			   dev->name);
+		} else {
+		    /*
+		    ** If the memory was allocated, point to the new memory
+		    ** area and initialize it (name, I/O address, next device
+		    ** (NULL) and initialisation probe routine).
+		    */
+		    tmp->name = (char *)(tmp + sizeof(struct device));
+		    if (num_eth > 9999) {
+			sprintf(tmp->name,"eth????");
+		    } else {               /* New device name */
+			sprintf(tmp->name,"eth%d", num_eth);
+		    }
+		    tmp->base_addr = 0;    /* re-insert the io address */
+		    tmp->next = NULL;      /* mark the end of list */
+		    tmp->init = init;      /* initialisation routine */
+		}
+	    } else {                       /* structure already exists */
+		tmp->base_addr = 0;        /* re-insert the io address */
 	    }
-	    tmp->base_addr = 0;                /* re-insert the io address */
-	    tmp->next = NULL;                  /* mark the end of list */
-	    tmp->init = init;                  /* initialisation routine */
-	  }
-	} else {                               /* structure already exists */
-	  tmp->base_addr = 0;                  /* re-insert the io address */
-	}
-      }
-    }
-  } else {
-    ret = dev;
-  }
-
-  return ret;
+	}
+    }
+    
+    return ret;
 }
 
 /*
 ** Auto configure the media here rather than setting the port at compile
-** time. This routine is called by de4x5_init() when a loss of media is
+** time. This routine is called by de4x5_init() and when a loss of media is
 ** detected (excessive collisions, loss of carrier, no carrier or link fail
-** [TP]) to check whether the user has been sneaky and changed the port on us.
+** [TP] or no recent receive activity) to check whether the user has been 
+** sneaky and changed the port on us.
 */
 static int autoconf_media(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-
-  lp->tx_enable = YES;
-  if (de4x5_debug > 0 ) {
-    if (lp->chipset != DC21140) {
-      printk("%s: Searching for media... ",dev->name);
-    } else {
-      printk("%s: Searching for mode... ",dev->name);
-    }
-  }
-
-  if (lp->chipset == DC21040) {
-    lp->media = (lp->autosense == AUTO ? TP : lp->autosense);
-    dc21040_autoconf(dev);
-  } else if (lp->chipset == DC21041) {
-    lp->media = (lp->autosense == AUTO ? TP_NW : lp->autosense);
-    dc21041_autoconf(dev);
-  } else if (lp->chipset == DC21140) {
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int next_tick = DE4X5_AUTOSENSE_MS;;
+    
+    lp->linkOK = 0;
+    lp->c_media = AUTO;                     /* Bogus last media */
     disable_ast(dev);
-    lp->media = (lp->autosense == AUTO ? _10Mb : lp->autosense);
-    dc21140_autoconf(dev);
-  }
-
-  if (de4x5_debug > 0 ) {
-    if (lp->chipset != DC21140) {
-      printk("media is %s\n", (lp->media == NC  ? "unconnected!" :
-			      (lp->media == TP  ? "TP." :
-			      (lp->media == ANS ? "TP/Nway." :
-			      (lp->media == BNC ? "BNC." : 
-			      (lp->media == AUI ? "AUI." : 
-				                  "BNC/AUI."
-			      ))))));
-    } else {
-      printk("mode is %s\n",(lp->media == NC      ? "link down.":
-			    (lp->media == _100Mb  ? "100Mb/s." :
-			    (lp->media == _10Mb   ? "10Mb/s." :
-				                    "\?\?\?"
-			    ))));
-    }
-  }
-
-  if (lp->media) {
-    lp->lostMedia = 0;
     inl(DE4X5_MFC);                         /* Zero the lost frames counter */
-    if ((lp->media == TP) || (lp->media == ANS)) {
-      lp->irq_mask |= IMR_LFM;
+    lp->media = INIT;
+    if (lp->chipset == DC21040) {
+	next_tick = dc21040_autoconf(dev);
+    } else if (lp->chipset == DC21041) {
+	next_tick = dc21041_autoconf(dev);
+    } else if (lp->chipset == DC21140) {
+	next_tick = dc21140m_autoconf(dev);
     }
-  }
-  dce_ms_delay(10);
-
-  return (lp->media);
+    if (lp->autosense == AUTO) enable_ast(dev, next_tick);
+    
+    return (lp->media);
 }
 
-static void dc21040_autoconf(struct device *dev)
-{
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  int i, linkBad;
-  s32 sisr = 0, t_3s    = 3000;
-
-  switch (lp->media) {
-  case TP:
-    reset_init_sia(dev, 0x8f01, 0xffff, 0x0000);
-    for (linkBad=1,i=0;(i<t_3s) && linkBad && !(sisr & SISR_NCR);i++) {
-      if (((sisr = inl(DE4X5_SISR)) & SISR_LKF) == 0) linkBad = 0;
-      dce_ms_delay(1);
-    }
-    if (linkBad && (lp->autosense == AUTO)) {
-      lp->media = BNC_AUI;
-      dc21040_autoconf(dev);
-    }
-    break;
-
-  case BNC:
-  case AUI:
-  case BNC_AUI:
-    reset_init_sia(dev, 0x8f09, 0x0705, 0x0006);
-    dce_ms_delay(500);
-    linkBad = ping_media(dev);
-    if (linkBad && (lp->autosense == AUTO)) {
-      lp->media = EXT_SIA;
-      dc21040_autoconf(dev);
-    }
-    break;
-
-  case EXT_SIA:
-    reset_init_sia(dev, 0x3041, 0x0000, 0x0006);
-    dce_ms_delay(500);
-    linkBad = ping_media(dev);
-    if (linkBad && (lp->autosense == AUTO)) {
-      lp->media = NC;
-      dc21040_autoconf(dev);
-    }
-    break;
-
-  case NC:
+/*
+** Autoconfigure the media when using the DC21040. AUI cannot be distinguished
+** from BNC as the port has a jumper to set thick or thin wire. When set for
+** BNC, the BNC port will indicate activity if it's not terminated correctly.
+** The only way to test for that is to place a loopback packet onto the
+** network and watch for errors. Since we're messing with the interrupt mask
+** register, disable the board interrupts and do not allow any more packets to
+** be queued to the hardware. Re-enable everything only when the media is
+** found.
+** I may have to "age out" locally queued packets so that the higher layer
+** timeouts don't effectively duplicate packets on the network.
+*/
+static int dc21040_autoconf(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int next_tick = DE4X5_AUTOSENSE_MS;
+    s32 imr;
+    
+    switch (lp->media) {
+      case INIT:
+	DISABLE_IRQs;
+	lp->tx_enable = NO;
+	lp->timeout = -1;
+	de4x5_save_skbs(dev);
+	if ((lp->autosense == AUTO) || (lp->autosense == TP)) {
+	    lp->media = TP;
+	} else if ((lp->autosense == BNC) || (lp->autosense == AUI) || (lp->autosense == BNC_AUI)) {
+	    lp->media = BNC_AUI;
+	} else if (lp->autosense == EXT_SIA) {
+	    lp->media = EXT_SIA;
+	} else {
+	    lp->media = NC;
+	}
+	lp->local_state = 0;
+	next_tick = dc21040_autoconf(dev);
+	break;
+	
+      case TP:
+	dc21040_state(dev, 0x8f01, 0xffff, 0x0000, 3000, BNC_AUI, 
+		                                         TP_SUSPECT, test_tp);
+	break;
+	
+      case TP_SUSPECT:
+	de4x5_suspect_state(dev, 1000, TP, test_tp, dc21040_autoconf);
+	break;
+	
+      case BNC:
+      case AUI:
+      case BNC_AUI:
+	dc21040_state(dev, 0x8f09, 0x0705, 0x0006, 3000, EXT_SIA, 
+		                                  BNC_AUI_SUSPECT, ping_media);
+	break;
+	
+      case BNC_AUI_SUSPECT:
+	de4x5_suspect_state(dev, 1000, BNC_AUI, ping_media, dc21040_autoconf);
+	break;
+	
+      case EXT_SIA:
+	dc21040_state(dev, 0x3041, 0x0000, 0x0006, 3000, 
+		                              NC, EXT_SIA_SUSPECT, ping_media);
+	break;
+	
+      case EXT_SIA_SUSPECT:
+	de4x5_suspect_state(dev, 1000, EXT_SIA, ping_media, dc21040_autoconf);
+	break;
+	
+      case NC:
 #ifndef __alpha__
-    reset_init_sia(dev, 0x8f01, 0xffff, 0x0000);
-    break;
+	reset_init_sia(dev, 0x8f01, 0xffff, 0x0000);
 #else
-    /* JAE: for Alpha, default to BNC/AUI, *not* TP */
-    reset_init_sia(dev, 0x8f09, 0x0705, 0x0006);
+	/* JAE: for Alpha, default to BNC/AUI, *not* TP */
+	reset_init_sia(dev, 0x8f09, 0x0705, 0x0006);
 #endif  /* i386 */
-  }
-
-  return;
+	de4x5_dbg_media(dev);
+	lp->media = INIT;
+	lp->tx_enable = NO;
+	break;
+    }
+    
+    return next_tick;
 }
 
-/*
-** Autoconfigure the media when using the DC21041. AUI needs to be tested
-** before BNC, because the BNC port will indicate activity if it's not
-** terminated correctly. The only way to test for that is to place a loopback
-** packet onto the network and watch for errors.
-*/
-static void dc21041_autoconf(struct device *dev)
+static int
+dc21040_state(struct device *dev, int csr13, int csr14, int csr15, int timeout,
+	      int next_state, int suspect_state, 
+	      int (*fn)(struct device *, int))
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  s32 sts, irqs, irq_mask, omr;
-
-  switch (lp->media) {
-  case TP_NW:
-    omr = inl(DE4X5_OMR);        /* Set up full duplex for the autonegotiate */
-    outl(omr | OMR_FD, DE4X5_OMR);
-    irqs = STS_LNF | STS_LNP;
-    irq_mask = IMR_LFM | IMR_LPM;
-    sts = test_media(dev, irqs, irq_mask, 0xef01, 0xffff, 0x0008, 2400);
-    if (sts & STS_LNP) {
-      lp->media = ANS;
-    } else {
-      lp->media = AUI;
-    }
-    dc21041_autoconf(dev);
-    break;
-
-  case ANS:
-    irqs = STS_LNP;
-    irq_mask = IMR_LPM;
-    sts = test_ans(dev, irqs, irq_mask, 3000);
-    if (!(sts & STS_LNP) && (lp->autosense == AUTO)) {
-      lp->media = TP;
-      dc21041_autoconf(dev);
-    }
-    break;
-
-  case TP:
-    omr = inl(DE4X5_OMR);                      /* Set up half duplex for TP */
-    outl(omr & ~OMR_FD, DE4X5_OMR);
-    irqs = STS_LNF | STS_LNP;
-    irq_mask = IMR_LFM | IMR_LPM;
-    sts = test_media(dev, irqs, irq_mask, 0xef01, 0xff3f, 0x0008, 2400);
-    if (!(sts & STS_LNP) && (lp->autosense == AUTO)) {
-      if (inl(DE4X5_SISR) & SISR_NRA) {    /* Non selected port activity */
-	lp->media = AUI;
-      } else {
-	lp->media = BNC;
-      }
-      dc21041_autoconf(dev);
-    }
-    break;
-
-  case AUI:
-    omr = inl(DE4X5_OMR);                      /* Set up half duplex for AUI */
-    outl(omr & ~OMR_FD, DE4X5_OMR);
-    irqs = 0;
-    irq_mask = 0;
-    sts = test_media(dev, irqs, irq_mask, 0xef09, 0xf7fd, 0x000e, 1000);
-    if (!(inl(DE4X5_SISR) & SISR_SRA) && (lp->autosense == AUTO)) {
-      lp->media = BNC;
-      dc21041_autoconf(dev);
-    }
-    break;
-
-  case BNC:
-    omr = inl(DE4X5_OMR);                      /* Set up half duplex for BNC */
-    outl(omr & ~OMR_FD, DE4X5_OMR);
-    irqs = 0;
-    irq_mask = 0;
-    sts = test_media(dev, irqs, irq_mask, 0xef09, 0xf7fd, 0x0006, 1000);
-    if (!(inl(DE4X5_SISR) & SISR_SRA) && (lp->autosense == AUTO)) {
-      lp->media = NC;
-    } else {                                   /* Ensure media connected */
-      if (ping_media(dev)) lp->media = NC;
-    }
-    break;
-
-  case NC:
-    omr = inl(DE4X5_OMR);        /* Set up full duplex for the autonegotiate */
-    outl(omr | OMR_FD, DE4X5_OMR);
-    reset_init_sia(dev, 0xef01, 0xffff, 0x0008);/* Initialise the SIA */
-    break;
-  }
-
-  return;
-}
-
-/*
-** Reduced feature version (temporary I hope)
-*/
-static void dc21140_autoconf(struct device *dev)
-{
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  s32 omr;
-
-  switch(lp->media) {
-  case _100Mb:      /* Set 100Mb/s, MII Port with PCS Function and Scrambler */
-    omr = (inl(DE4X5_OMR) & ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR));
-    omr |= (de4x5_full_duplex ? OMR_FD : 0);   /* Set up Full Duplex */
-    outl(omr | OMR_PS | OMR_HBD | OMR_PCS | OMR_SCR, DE4X5_OMR);
-    outl(GEP_FDXD | GEP_MODE, DE4X5_GEP);
-    break;
-
-  case _10Mb:       /* Set conventional 10Mb/s ENDEC interface */
-    omr = (inl(DE4X5_OMR) & ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR));
-    omr |= (de4x5_full_duplex ? OMR_FD : 0);   /* Set up Full Duplex */
-    outl(omr | OMR_TTM, DE4X5_OMR);
-    outl(GEP_FDXD, DE4X5_GEP);
-    break;
-  }
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int next_tick = DE4X5_AUTOSENSE_MS;
+    int linkBad;
 
-  return;
+    switch (lp->local_state) {
+      case 0:
+	reset_init_sia(dev, csr13, csr14, csr15);
+	lp->local_state++;
+	next_tick = 500;
+	break;
+	    
+      case 1:
+	if (!lp->tx_enable) {
+	    linkBad = fn(dev, timeout);
+	    if (linkBad < 0) {
+		next_tick = linkBad & ~TIMER_CB;
+	    } else {
+		if (linkBad && (lp->autosense == AUTO)) {
+		    lp->local_state = 0;
+		    lp->media = next_state;
+		} else {
+		    de4x5_init_connection(dev);
+		}
+	    }
+	} else if (!lp->linkOK && (lp->autosense == AUTO)) {
+	    lp->media = suspect_state;
+	    next_tick = 3000;
+	}
+	break;
+    }
+    
+    return next_tick;
 }
 
 static int
-test_media(struct device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14, s32 csr15, s32 msec)
+de4x5_suspect_state(struct device *dev, int timeout, int prev_state,
+		      int (*fn)(struct device *, int),
+		      int (*asfn)(struct device *))
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  s32 sts, time, csr12;
-
-  reset_init_sia(dev, csr13, csr14, csr15);
-
-  /* Set link_fail_inhibit_timer */
-  load_ms_timer(dev, msec);
-
-  /* clear all pending interrupts */
-  sts = inl(DE4X5_STS);
-  outl(sts, DE4X5_STS);
-
-  /* clear csr12 NRA and SRA bits */
-  csr12 = inl(DE4X5_SISR);
-  outl(csr12, DE4X5_SISR);
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int next_tick = DE4X5_AUTOSENSE_MS;
+    int linkBad;
 
-  /* Poll for timeout - timer interrupt doesn't work correctly */
-  do {
-    time = inl(DE4X5_GPT) & GPT_VAL;
-    sts = inl(DE4X5_STS);
-  } while ((time != 0) && !(sts & irqs));
+    switch (lp->local_state) {
+      case 1:
+	if (lp->linkOK && !LOST_MEDIA) {
+	    lp->media = prev_state;
+	} else {
+	    lp->local_state++;
+	    next_tick = asfn(dev);
+	}
+	break;
 
-  sts = inl(DE4X5_STS);
+      case 2:
+	linkBad = fn(dev, timeout);
+	if (linkBad < 0) {
+	    next_tick = linkBad & ~TIMER_CB;
+	} else if (!linkBad) {
+	    lp->local_state--;
+	    lp->media = prev_state;
+	} else {
+	    lp->media = INIT;
+	}
+    }
 
-  return sts;
+    return next_tick;
 }
-/*
-static int test_sym_link(struct device *dev, u32 msec)
-{
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  u32 gep, time;
-
-  / * Set link_fail_inhibit_timer * /
-  load_ms_timer(dev, msec);
 
-  / * Poll for timeout or SYM_LINK=0 * /
-  do {
-    time = inl(DE4X5_GPT) & GPT_VAL;
-    gep = inl(DE4X5_GEP) & (GEP_SLNK | GEP_LNP);
-  } while ((time > 0) && (gep & GEP_SLNK));
-
-  return gep;
-}
-*/
 /*
-** Send a packet onto the media and watch for send errors that indicate the
-** media is bad or unconnected.
+** Autoconfigure the media when using the DC21041. AUI needs to be tested
+** before BNC, because the BNC port will indicate activity if it's not
+** terminated correctly. The only way to test for that is to place a loopback
+** packet onto the network and watch for errors. Since we're messing with
+** the interrupt mask register, disable the board interrupts and do not allow
+** any more packets to be queued to the hardware. Re-enable everything only
+** when the media is found.
 */
-static int ping_media(struct device *dev)
+static int dc21041_autoconf(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  int i, entry, linkBad;
-  s32 omr, t_3s = 4000;
-  char frame[64];
-
-  create_packet(dev, frame, sizeof(frame));
-
-  entry = lp->tx_new;                        /* Remember the ring position */
-  load_packet(dev, frame, TD_LS | TD_FS | sizeof(frame),NULL);
-
-  omr = inl(DE4X5_OMR);
-  outl(omr|OMR_ST, DE4X5_OMR);
-
-  lp->tx_new = (++lp->tx_new) % lp->txRingSize;
-  lp->tx_old = lp->tx_new;
-
-  /* Poll for completion of frame (interrupts are disabled for now)... */
-  for (linkBad=1,i=0;(i<t_3s) && linkBad;i++) {
-    if ((inl(DE4X5_SISR) & SISR_NCR) == 1) break;
-    if (lp->tx_ring[entry].status >= 0) linkBad=0;
-    dce_ms_delay(1);
-  }
-  outl(omr, DE4X5_OMR); 
-
-  return ((linkBad || (lp->tx_ring[entry].status & TD_ES)) ? 1 : 0);
-}
-
-/*
-** Check the Auto Negotiation State. Return OK when a link pass interrupt
-** is received and the auto-negotiation status is NWAY OK.
-*/
-static int test_ans(struct device *dev, s32 irqs, s32 irq_mask, s32 msec)
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    s32 sts, irqs, irq_mask, imr, omr;
+    int next_tick = DE4X5_AUTOSENSE_MS;
+    
+    switch (lp->media) {
+      case INIT:
+	DISABLE_IRQs;
+	lp->tx_enable = NO;
+	lp->timeout = -1;
+	de4x5_save_skbs(dev);          /* Save non transmitted skb's */
+	if ((lp->autosense == AUTO) || (lp->autosense == TP_NW)) {
+	    lp->media = TP;            /* On chip auto negotiation is broken */
+	} else if (lp->autosense == TP) {
+	    lp->media = TP;
+	} else if (lp->autosense == BNC) {
+	    lp->media = BNC;
+	} else if (lp->autosense == AUI) {
+	    lp->media = AUI;
+	} else {
+	    lp->media = NC;
+	}
+	lp->local_state = 0;
+	next_tick = dc21041_autoconf(dev);
+	break;
+	
+      case TP_NW:
+	if (lp->timeout < 0) {
+	    omr = inl(DE4X5_OMR);/* Set up full duplex for the autonegotiate */
+	    outl(omr | OMR_FD, DE4X5_OMR);
+	}
+	irqs = STS_LNF | STS_LNP;
+	irq_mask = IMR_LFM | IMR_LPM;
+	sts = test_media(dev, irqs, irq_mask, 0xef01, 0xffff, 0x0008, 2400);
+	if (sts < 0) {
+	    next_tick = sts & ~TIMER_CB;
+	} else {
+	    if (sts & STS_LNP) {
+		lp->media = ANS;
+	    } else {
+		lp->media = AUI;
+	    }
+	    next_tick = dc21041_autoconf(dev);
+	}
+	break;
+	
+      case ANS:
+	if (!lp->tx_enable) {
+	    irqs = STS_LNP;
+	    irq_mask = IMR_LPM;
+	    sts = test_ans(dev, irqs, irq_mask, 3000);
+	    if (sts < 0) {
+		next_tick = sts & ~TIMER_CB;
+	    } else {
+		if (!(sts & STS_LNP) && (lp->autosense == AUTO)) {
+		    lp->media = TP;
+		    next_tick = dc21041_autoconf(dev);
+		} else {
+		    de4x5_init_connection(dev);
+		}
+	    }
+	} else if (!lp->linkOK && (lp->autosense == AUTO)) {
+	    lp->media = ANS_SUSPECT;
+	    next_tick = 3000;
+	}
+	break;
+	
+      case ANS_SUSPECT:
+	de4x5_suspect_state(dev, 1000, ANS, test_tp, dc21041_autoconf);
+	break;
+	
+      case TP:
+	if (!lp->tx_enable) {
+	    if (lp->timeout < 0) {
+		omr = inl(DE4X5_OMR);          /* Set up half duplex for TP */
+		outl(omr & ~OMR_FD, DE4X5_OMR);
+	    }
+	    irqs = STS_LNF | STS_LNP;
+	    irq_mask = IMR_LFM | IMR_LPM;
+	    sts = test_media(dev,irqs, irq_mask, 0xef01, 0xff3f, 0x0008, 2400);
+	    if (sts < 0) {
+		next_tick = sts & ~TIMER_CB;
+	    } else {
+		if (!(sts & STS_LNP) && (lp->autosense == AUTO)) {
+		    if (inl(DE4X5_SISR) & SISR_NRA) {
+			lp->media = AUI;       /* Non selected port activity */
+		    } else {
+			lp->media = BNC;
+		    }
+		    next_tick = dc21041_autoconf(dev);
+		} else {
+		    de4x5_init_connection(dev);
+		}
+	    }
+	} else if (!lp->linkOK && (lp->autosense == AUTO)) {
+	    lp->media = TP_SUSPECT;
+	    next_tick = 3000;
+	}
+	break;
+	
+      case TP_SUSPECT:
+	de4x5_suspect_state(dev, 1000, TP, test_tp, dc21041_autoconf);
+	break;
+	
+      case AUI:
+	if (!lp->tx_enable) {
+	    if (lp->timeout < 0) {
+		omr = inl(DE4X5_OMR);          /* Set up half duplex for AUI */
+		outl(omr & ~OMR_FD, DE4X5_OMR);
+	    }
+	    irqs = 0;
+	    irq_mask = 0;
+	    sts = test_media(dev,irqs, irq_mask, 0xef09, 0xf7fd, 0x000e, 1000);
+	    if (sts < 0) {
+		next_tick = sts & ~TIMER_CB;
+	    } else {
+		if (!(inl(DE4X5_SISR) & SISR_SRA) && (lp->autosense == AUTO)) {
+		    lp->media = BNC;
+		    next_tick = dc21041_autoconf(dev);
+		} else {
+		    de4x5_init_connection(dev);
+		}
+	    }
+	} else if (!lp->linkOK && (lp->autosense == AUTO)) {
+	    lp->media = AUI_SUSPECT;
+	    next_tick = 3000;
+	}
+	break;
+	
+      case AUI_SUSPECT:
+	de4x5_suspect_state(dev, 1000, AUI, ping_media, dc21041_autoconf);
+	break;
+	
+      case BNC:
+	switch (lp->local_state) {
+	  case 0:
+	    if (lp->timeout < 0) {
+		omr = inl(DE4X5_OMR);          /* Set up half duplex for BNC */
+		outl(omr & ~OMR_FD, DE4X5_OMR);
+	    }
+	    irqs = 0;
+	    irq_mask = 0;
+	    sts = test_media(dev,irqs, irq_mask, 0xef09, 0xf7fd, 0x0006, 1000);
+	    if (sts < 0) {
+		next_tick = sts & ~TIMER_CB;
+	    } else {
+		if (!(inl(DE4X5_SISR) & SISR_SRA) && (lp->autosense == AUTO)) {
+		    lp->media = NC;
+		} else {
+		    lp->local_state++;         /* Ensure media connected */
+		    next_tick = dc21041_autoconf(dev);
+		}
+	    }
+	    break;
+	    
+	  case 1:
+	    if (!lp->tx_enable) {
+		if ((sts = ping_media(dev, 3000)) < 0) {
+		    next_tick = sts & ~TIMER_CB;
+		} else {
+		    if (sts) {
+			lp->local_state = 0;
+			lp->media = NC;
+		    } else {
+			de4x5_init_connection(dev);
+		    }
+		}
+	    } else if (!lp->linkOK && (lp->autosense == AUTO)) {
+		lp->media = BNC_SUSPECT;
+		next_tick = 3000;
+	    }
+	    break;
+	}
+	break;
+	
+      case BNC_SUSPECT:
+	de4x5_suspect_state(dev, 1000, BNC, ping_media, dc21041_autoconf);
+	break;
+	
+      case NC:
+	omr = inl(DE4X5_OMR);    /* Set up full duplex for the autonegotiate */
+	outl(omr | OMR_FD, DE4X5_OMR);
+	reset_init_sia(dev, 0xef01, 0xffff, 0x0008);/* Initialise the SIA */
+	de4x5_dbg_media(dev);
+	lp->media = INIT;
+	lp->tx_enable = NO;
+	break;
+    }
+    
+    return next_tick;
+}
+
+static int dc21140m_autoconf(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int ana, anlpa, cap, cr, sr, iobase = dev->base_addr;
+    int next_tick = DE4X5_AUTOSENSE_MS;
+    u_long imr, omr;
+    
+    switch(lp->media) {
+      case INIT: 
+	DISABLE_IRQs;
+	lp->tx_enable = FALSE;
+	lp->timeout = -1;
+	if ((next_tick = de4x5_reset_phy(dev)) < 0) {
+	    next_tick &= ~TIMER_CB;
+	} else {
+	    de4x5_save_skbs(dev);          /* Save non transmitted skb's */
+	    SET_10Mb;
+	    if (lp->autosense == _100Mb) {
+		lp->media = _100Mb;
+	    } else if (lp->autosense == _10Mb) {
+		lp->media = _10Mb;
+	    } else if ((lp->autosense == AUTO) && (sr=is_anc_capable(dev))) {
+		ana = (((sr >> 6) & MII_ANA_TAF) | MII_ANA_CSMA);
+		ana &= (de4x5_full_duplex ? ~0 : ~MII_ANA_FDAM);
+		mii_wr(ana, MII_ANA, lp->phy[lp->active].addr, DE4X5_MII);
+		lp->media = ANS;
+	    } else if (lp->autosense == AUTO) {
+		lp->media = SPD_DET;
+	    } else if (is_spd_100(dev) && is_100_up(dev)) {
+		lp->media = _100Mb;
+	    } else {
+		lp->media = NC;
+	    }
+	    lp->local_state = 0;
+	    next_tick = dc21140m_autoconf(dev);
+	}
+	break;
+	
+      case ANS:
+	switch (lp->local_state) {
+	  case 0:
+	    if (lp->timeout < 0) {
+		mii_wr(MII_CR_ASSE | MII_CR_RAN, MII_CR, lp->phy[lp->active].addr, DE4X5_MII);
+	    }
+	    cr = test_mii_reg(dev, MII_CR, MII_CR_RAN, FALSE, 500);
+	    if (cr < 0) {
+		next_tick = cr & ~TIMER_CB;
+	    } else {
+		if (cr) {
+		    lp->local_state = 0;
+		    lp->media = SPD_DET;
+		} else {
+		    lp->local_state++;
+		}
+		next_tick = dc21140m_autoconf(dev);
+	    }
+	    break;
+	    
+	  case 1:
+	    if ((sr=test_mii_reg(dev, MII_SR, MII_SR_ASSC, TRUE, 3000)) < 0) {
+		next_tick = sr & ~TIMER_CB;
+	    } else {
+		lp->media = SPD_DET;
+		lp->local_state = 0;
+		if (sr) {                         /* Success! */
+		    anlpa = mii_rd(MII_ANLPA, lp->phy[lp->active].addr, DE4X5_MII);
+		    ana = mii_rd(MII_ANA, lp->phy[lp->active].addr, DE4X5_MII);
+		    if ((anlpa & MII_ANLPA_ACK) && !(anlpa & MII_ANLPA_RF) &&
+			(cap = anlpa & MII_ANLPA_TAF & ana)) {
+			if (cap & MII_ANA_100M) {
+			    de4x5_full_duplex = ((ana & anlpa & MII_ANA_FDAM & MII_ANA_100M) ? TRUE : FALSE);
+			    lp->media = _100Mb;
+			} else if (cap & MII_ANA_10M) {
+			    de4x5_full_duplex = ((ana & anlpa & MII_ANA_FDAM & MII_ANA_10M) ? TRUE : FALSE);
+			    lp->media = _10Mb;
+			}
+		    }
+		}                       /* Auto Negotiation failed to finish */
+		next_tick = dc21140m_autoconf(dev);
+	    }                           /* Auto Negotiation failed to start */
+	    break;
+	}
+	break;
+	
+      case SPD_DET:                              /* Choose 10Mb/s or 100Mb/s */
+	if (!lp->phy[lp->active].id) {
+	    outl(GEP_FDXD | GEP_MODE, DE4X5_GEP);
+	}
+	if (is_spd_100(dev) && is_100_up(dev)) {
+	    lp->media = _100Mb;
+	} else if (!is_spd_100(dev) && is_10_up(dev)) {
+	    lp->media = _10Mb;
+	} else {
+	    lp->media = NC;
+	}
+	next_tick = dc21140m_autoconf(dev);
+	break;
+	
+      case _100Mb:                               /* Set 100Mb/s */
+	next_tick = 3000;
+	if (!lp->tx_enable) {
+	    SET_100Mb;
+	    de4x5_init_connection(dev);
+	} else {
+	    if (!lp->linkOK && (lp->autosense == AUTO)) {
+		if (!(is_spd_100(dev) && is_100_up(dev))) {
+		    lp->media = INIT;
+		    next_tick = DE4X5_AUTOSENSE_MS;
+		}
+	    }
+	}
+	break;
+	
+      case _10Mb:                                /* Set 10Mb/s */
+	next_tick = 3000;
+	if (!lp->tx_enable) {
+	    SET_10Mb;
+	    de4x5_init_connection(dev);
+	} else {
+	    if (!lp->linkOK && (lp->autosense == AUTO)) {
+		if (!(!is_spd_100(dev) && is_10_up(dev))) {
+		    lp->media = INIT;
+		    next_tick = DE4X5_AUTOSENSE_MS;
+		}
+	    }
+	}
+	break;
+	
+      case NC:
+	SET_10Mb;
+	de4x5_dbg_media(dev);
+	lp->media = INIT;
+	lp->tx_enable = FALSE;
+	break;
+    }
+    
+    return next_tick;
+}
+
+static void de4x5_init_connection(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  s32 sts, ans;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
 
-  outl(irq_mask, DE4X5_IMR);
+    de4x5_dbg_media(dev);
+    de4x5_restore_skbs(dev);
+    cli();
+    de4x5_rx(dev);
+    de4x5_setup_intr(dev);
+    lp->lostMedia = 0;
+    lp->tx_enable = YES;
+    sti();
+    outl(POLL_DEMAND, DE4X5_TPD);
 
-  /* Set timeout limit */
-  load_ms_timer(dev, msec);
+    return;
+}
 
-  /* clear all pending interrupts */
-  sts = inl(DE4X5_STS);
-  outl(sts, DE4X5_STS);
+static int de4x5_reset_phy(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int next_tick = 0;
 
-  /* Poll for interrupts */
-  do {
-    ans = inl(DE4X5_SISR) & SISR_ANS;
-    sts = inl(DE4X5_STS);
-  } while (!(sts & irqs) && (ans ^ ANS_NWOK) != 0);
+    if (lp->phy[lp->active].id) {
+	if (lp->timeout < 0) {
+	    outl(GEP_HRST, DE4X5_GEP);           /* Hard RESET the PHY dev. */
+	    udelay(1000);                        /* Assert for 1ms */
+	    outl(0x00, DE4X5_GEP);
+	    udelay(2000);                        /* Wait for 2ms */
+	    mii_wr(MII_CR_RST, MII_CR, lp->phy[lp->active].addr, DE4X5_MII);
+	}
+	next_tick = test_mii_reg(dev, MII_CR, MII_CR_RST, FALSE, 500);
+    }
+    
+    return next_tick;
+}
+
+static int
+test_media(struct device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14, s32 csr15, s32 msec)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    s32 sts, csr12;
+    
+    if (lp->timeout < 0) {
+	lp->timeout = msec/100;
+	reset_init_sia(dev, csr13, csr14, csr15);
+
+	/* set up the interrupt mask */
+	outl(irq_mask, DE4X5_IMR);
+
+	/* clear all pending interrupts */
+	sts = inl(DE4X5_STS);
+	outl(sts, DE4X5_STS);
+	
+	/* clear csr12 NRA and SRA bits */
+	if (lp->chipset == DC21041) {
+	    csr12 = inl(DE4X5_SISR);
+	    outl(csr12, DE4X5_SISR);
+	}
+    }
+    
+    sts = inl(DE4X5_STS) & ~TIMER_CB;
+    
+    if (!(sts & irqs) && --lp->timeout) {
+	sts = 100 | TIMER_CB;
+    } else {
+	lp->timeout = -1;
+    }
+    
+    return sts;
+}
 
-  return ((sts & STS_LNP) && ((ans ^ ANS_NWOK) == 0) ? STS_LNP : 0);
+static int test_tp(struct device *dev, s32 msec)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int sisr;
+    
+    if (lp->timeout < 0) {
+	lp->timeout = msec/100;
+    }
+    
+    sisr = (inl(DE4X5_SISR) & ~TIMER_CB) & (SISR_LKF | SISR_NCR);
+
+    if (sisr && --lp->timeout) {
+	sisr = 100 | TIMER_CB;
+    } else {
+	lp->timeout = -1;
+    }
+    
+    return sisr;
 }
 
 /*
 **
+**
 */
-static void reset_init_sia(struct device *dev, s32 sicr, s32 strr, s32 sigr)
+static int test_mii_reg(struct device *dev, int reg, int mask, int pol, long msec)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int test, iobase = dev->base_addr;
+    
+    if (lp->timeout < 0) {
+	lp->timeout = msec/100;
+    }
+    
+    if (pol) pol = ~0;
+    reg = mii_rd(reg, lp->phy[lp->active].addr, DE4X5_MII) & mask;
+    test = (reg ^ pol) & mask;
+    
+    if (test && --lp->timeout) {
+	reg = 100 | TIMER_CB;
+    } else {
+	lp->timeout = -1;
+    }
+    
+    return reg;
+}
+
+static int is_spd_100(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int spd;
+    
+    if (lp->phy[lp->active].id) {
+	spd = mii_rd(lp->phy[lp->active].spd.reg, lp->phy[lp->active].addr, DE4X5_MII);
+	spd = ~(spd ^ lp->phy[lp->active].spd.value);
+	spd &= lp->phy[lp->active].spd.mask;
+    } else {
+	spd = ((~inl(DE4X5_GEP)) & GEP_SLNK);
+    }
+    
+    return spd;
+}
+
+static int is_100_up(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    
+    if (lp->phy[lp->active].id) {
+	/* Double read for sticky bits & temporary drops */
+	mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
+	return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS);
+    } else {
+	return ((~inl(DE4X5_GEP)) & GEP_SLNK);
+    }
+}
+
+static int is_10_up(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    
+    if (lp->phy[lp->active].id) {
+	/* Double read for sticky bits & temporary drops */
+	mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII);
+	return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_LKS);
+    } else {
+	return ((~inl(DE4X5_GEP)) & GEP_LNP);
+    }
+}
+
+static int is_anc_capable(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    
+    if (lp->phy[lp->active].id) {
+	return (mii_rd(MII_SR, lp->phy[lp->active].addr, DE4X5_MII) & MII_SR_ANC);
+    } else {
+	return 0;
+    }
+}
 
-  RESET_SIA;
-  outl(sigr, DE4X5_SIGR);
-  outl(strr, DE4X5_STRR);
-  outl(sicr, DE4X5_SICR);
+/*
+** Send a packet onto the media and watch for send errors that indicate the
+** media is bad or unconnected.
+*/
+static int ping_media(struct device *dev, int msec)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int sisr;
+    
+    if (lp->timeout < 0) {
+	lp->timeout = msec/100;
+	
+	lp->tmp = lp->tx_new;                /* Remember the ring position */
+	load_packet(dev, lp->frame, TD_LS | TD_FS | sizeof(lp->frame), NULL);
+	lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+	outl(POLL_DEMAND, DE4X5_TPD);
+    }
+    
+    sisr = inl(DE4X5_SISR);
 
-  return;
+    if ((!(sisr & SISR_NCR)) && (lp->tx_ring[lp->tmp].status < 0) && (--lp->timeout)) {
+	sisr = 100 | TIMER_CB;
+    } else {
+	if ((!(sisr & SISR_NCR)) && 
+	    !(lp->tx_ring[lp->tmp].status & (T_OWN | TD_ES)) && lp->timeout) {
+	    sisr = 0;
+	} else {
+	    sisr = 1;
+	}
+	lp->timeout = -1;
+    }
+    
+    return sisr;
 }
 
 /*
-** Load the timer on the DC21041 and 21140. Max time is 13.42 secs.
+** When a user pulls a connection, the DECchip can end up in a
+** 'running - waiting for end of transmission' state. This means that we
+** have to perform a chip soft reset to ensure that we can synchronize
+** the hardware and software and make any media probes using a loopback
+** packet meaningful.
 */
-static void load_ms_timer(struct device *dev, u32 msec)
+static void de4x5_save_skbs(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-  s32 i = 2048, j;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    int i;
+    s32 omr;
+
+    if (!lp->cache.save_cnt) {
+	STOP_DE4X5;
+	de4x5_tx(dev);                          /* Flush any sent skb's */
+	for (i=lp->tx_new; i!=lp->tx_old; i--) {
+	    if (lp->skb[i]) {
+		de4x5_putb_cache(dev, lp->skb[i]);
+		lp->skb[i] = NULL;
+	    }
+	    if (i==0) i=lp->txRingSize;
+	}
+        if (lp->skb[i]) {
+	    de4x5_putb_cache(dev, lp->skb[i]);
+	    lp->skb[i] = NULL;
+	}
 
-  if (lp->chipset == DC21140) {
-    j = inl(DE4X5_OMR);
-    if ((j & OMR_TTM) && (j & OMR_PS)) {          /* 10Mb/s MII */
-      i = 8192;
-    } else if ((~j & OMR_TTM) && (j & OMR_PS)) {  /* 100Mb/s MII */
-      i = 819;
+	de4x5_cache_state(dev, DE4X5_SAVE_STATE);
+	de4x5_sw_reset(dev);
+	de4x5_cache_state(dev, DE4X5_RESTORE_STATE);
+	dev->tbusy = 0;
+	lp->cache.save_cnt++;
+	START_DE4X5;
     }
-  }
 
-  outl((s32)(msec * 10000)/i, DE4X5_GPT);
+    return;
+}
+
+static void de4x5_restore_skbs(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    struct sk_buff *skb;
+    int i;
+    s32 omr;
+
+    if (lp->cache.save_cnt) {
+	STOP_DE4X5;
+	de4x5_cache_state(dev, DE4X5_SAVE_STATE);
+	de4x5_sw_reset(dev);
+	de4x5_cache_state(dev, DE4X5_RESTORE_STATE);
+	dev->tbusy = 1;
+
+	for (i=0; TX_BUFFS_AVAIL && lp->cache.skb; i++) {
+	    skb = de4x5_get_cache(dev);
+	    load_packet(dev, skb->data, TD_IC | TD_LS | TD_FS | skb->len, skb);
+	    lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+	}
+	if (TX_BUFFS_AVAIL) {
+	    dev->tbusy = 0;
+	}
+	lp->cache.save_cnt--;
+	START_DE4X5;
+    }
+        
+    return;
+}
+
+static void de4x5_cache_state(struct device *dev, int flag)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    s32 gep;
 
-  return;
+    switch(flag) {
+      case DE4X5_SAVE_STATE:
+	lp->cache.csr0 = inl(DE4X5_BMR);
+	lp->cache.csr6 = (inl(DE4X5_OMR) & ~(OMR_ST | OMR_SR));
+	lp->cache.csr7 = inl(DE4X5_IMR);
+	if (lp->chipset != DC21140) {
+	    lp->cache.csr13 = inl(DE4X5_SICR);
+	    lp->cache.csr14 = inl(DE4X5_STRR);
+	    lp->cache.csr15 = inl(DE4X5_SIGR);
+	}
+	break;
+
+      case DE4X5_RESTORE_STATE:
+	outl(lp->cache.csr0, DE4X5_BMR);
+	outl(lp->cache.csr6, DE4X5_OMR);
+	outl(lp->cache.csr7, DE4X5_IMR);
+	if (lp->chipset == DC21140) {
+	    outl(GEP_INIT, DE4X5_GEP);
+	    gep = (lp->media == _100Mb ? GEP_MODE : 0);
+	    if (!lp->phy[lp->active].id && !de4x5_full_duplex) {
+		gep |= GEP_FDXD;
+	    }
+	    outl(gep, DE4X5_GEP);
+	} else {
+	    reset_init_sia(dev, lp->cache.csr13, lp->cache.csr14, 
+			                                      lp->cache.csr15);
+	}
+	break;
+    }
+
+    return;
+}
+
+static void de4x5_put_cache(struct device *dev, struct sk_buff *skb)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    struct sk_buff *p;
+
+    if (lp->cache.skb) {
+	for (p=lp->cache.skb; p->next; p=p->next);
+	p->next = skb;
+    } else {
+	lp->cache.skb = skb;
+    }
+    skb->next = NULL;
+
+    return;
+}
+
+static void de4x5_putb_cache(struct device *dev, struct sk_buff *skb)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    struct sk_buff *p = lp->cache.skb;
+
+    lp->cache.skb = skb;
+    skb->next = p;
+
+    return;
+}
+
+static struct sk_buff *de4x5_get_cache(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    struct sk_buff *p = lp->cache.skb;
+
+    if (p) {
+	lp->cache.skb = p->next;
+	p->next = NULL;
+    }
+
+    return p;
 }
 
 /*
-** Create an Ethernet packet with an invalid CRC
+** Check the Auto Negotiation State. Return OK when a link pass interrupt
+** is received and the auto-negotiation status is NWAY OK.
 */
-static void create_packet(struct device *dev, char *frame, int len)
+static int test_ans(struct device *dev, s32 irqs, s32 irq_mask, s32 msec)
 {
-  int i;
-  char *buf = frame;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    s32 sts, ans;
+    
+    if (lp->timeout < 0) {
+	lp->timeout = msec/100;
+	outl(irq_mask, DE4X5_IMR);
+	
+	/* clear all pending interrupts */
+	sts = inl(DE4X5_STS);
+	outl(sts, DE4X5_STS);
+    }
+    
+    ans = inl(DE4X5_SISR) & SISR_ANS;
+    sts = inl(DE4X5_STS) & ~TIMER_CB;
+    
+    if (!(sts & irqs) && (ans ^ ANS_NWOK) && --lp->timeout) {
+	sts = 100 | TIMER_CB;
+    } else {
+	lp->timeout = -1;
+    }
+    
+    return sts;
+}
 
-  for (i=0; i<ETH_ALEN; i++) {             /* Use this source address */
-    *buf++ = dev->dev_addr[i];
-  }
-  for (i=0; i<ETH_ALEN; i++) {             /* Use this destination address */
-    *buf++ = dev->dev_addr[i];
-  }
+static void de4x5_setup_intr(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    s32 imr, sts;
+    
+    if (inl(DE4X5_OMR) & OMR_SR) {   /* Only unmask if TX/RX is enabled */
+	imr = 0;
+	UNMASK_IRQs;
+	sts = inl(DE4X5_STS);        /* Reset any pending (stale) interrupts */
+	outl(sts, DE4X5_STS);
+	ENABLE_IRQs;
+    }
+    
+    return;
+}
 
-  *buf++ = 0;                              /* Packet length (2 bytes) */
-  *buf++ = 1;
-  
-  return;
+/*
+**
+*/
+static void reset_init_sia(struct device *dev, s32 sicr, s32 strr, s32 sigr)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    u_long iobase = dev->base_addr;
+    
+    RESET_SIA;
+    outl(sigr, DE4X5_SIGR);
+    outl(strr, DE4X5_STRR);
+    outl(sicr, DE4X5_SICR);
+
+    return;
 }
 
 /*
-** Known delay in microseconds
+** Create a loopback ethernet packet with an invalid CRC
 */
-static void dce_us_delay(u32 usec)
+static void create_packet(struct device *dev, char *frame, int len)
 {
-  udelay(usec);
+    int i;
+    char *buf = frame;
+    
+    for (i=0; i<ETH_ALEN; i++) {             /* Use this source address */
+	*buf++ = dev->dev_addr[i];
+    }
+    for (i=0; i<ETH_ALEN; i++) {             /* Use this destination address */
+	*buf++ = dev->dev_addr[i];
+    }
+    
+    *buf++ = 0;                              /* Packet length (2 bytes) */
+    *buf++ = 1;
+    
+    return;
+}
 
-  return;
+/*
+** Known delay in microseconds
+*/
+static void de4x5_us_delay(u32 usec)
+{
+    udelay(usec);
+    
+    return;
 }
 
 /*
 ** Known delay in milliseconds, in millisecond steps.
 */
-static void dce_ms_delay(u32 msec)
+static void de4x5_ms_delay(u32 msec)
 {
-  u_int i;
-  
-  for (i=0; i<msec; i++) {
-    dce_us_delay(1000);
-  }
-
-  return;
+    u_int i;
+    
+    for (i=0; i<msec; i++) {
+	de4x5_us_delay(1000);
+    }
+    
+    return;
 }
 
 
@@ -2170,148 +2757,173 @@
 */
 static int EISA_signature(char *name, s32 eisa_id)
 {
-  u_int i;
-  const char *signatures[] = DE4X5_SIGNATURE;
-  char ManCode[DE4X5_STRLEN];
-  union {
-    s32 ID;
-    char Id[4];
-  } Eisa;
-  int status = 0;
-
-  *name = '\0';
-  Eisa.ID = inl(eisa_id);
-
-  ManCode[0]=(((Eisa.Id[0]>>2)&0x1f)+0x40);
-  ManCode[1]=(((Eisa.Id[1]&0xe0)>>5)+((Eisa.Id[0]&0x03)<<3)+0x40);
-  ManCode[2]=(((Eisa.Id[2]>>4)&0x0f)+0x30);
-  ManCode[3]=((Eisa.Id[2]&0x0f)+0x30);
-  ManCode[4]=(((Eisa.Id[3]>>4)&0x0f)+0x30);
-  ManCode[5]='\0';
-
-  for (i=0;(*signatures[i] != '\0') && (*name == '\0');i++) {
-    if (strstr(ManCode, signatures[i]) != NULL) {
-      strcpy(name,ManCode);
-      status = 1;
+    c_char *signatures[] = DE4X5_SIGNATURE;
+    char ManCode[DE4X5_STRLEN];
+    union {
+	s32 ID;
+	char Id[4];
+    } Eisa;
+    int i, status = 0, siglen = sizeof(signatures)/sizeof(c_char *);
+    
+    *name = '\0';
+    Eisa.ID = inl(eisa_id);
+    
+    ManCode[0]=(((Eisa.Id[0]>>2)&0x1f)+0x40);
+    ManCode[1]=(((Eisa.Id[1]&0xe0)>>5)+((Eisa.Id[0]&0x03)<<3)+0x40);
+    ManCode[2]=(((Eisa.Id[2]>>4)&0x0f)+0x30);
+    ManCode[3]=((Eisa.Id[2]&0x0f)+0x30);
+    ManCode[4]=(((Eisa.Id[3]>>4)&0x0f)+0x30);
+    ManCode[5]='\0';
+    
+    for (i=0;i<siglen;i++) {
+	if (strstr(ManCode, signatures[i]) != NULL) {
+	    strcpy(name,ManCode);
+	    status = 1;
+	    break;
+	}
     }
-  }
-
-  return status;                           /* return the device name string */
+    
+    return status;                         /* return the device name string */
 }
 
 /*
-** Look for a special sequence in the Ethernet station address PROM that
-** is common across all DIGITAL network adapter products.
-** 
-** Search the Ethernet address ROM for the signature. Since the ROM address
-** counter can start at an arbitrary point, the search must include the entire
-** probe sequence length plus the (length_of_the_signature - 1).
-** Stop the search IMMEDIATELY after the signature is found so that the
-** PROM address counter is correctly positioned at the start of the
-** ethernet address for later read out.
+** Look for a particular board name in the PCI configuration space
 */
-
-static int DevicePresent(u_long aprom_addr)
+static int PCI_signature(char *name, struct bus_type *lp)
 {
-  union {
-    struct {
-      u32 a;
-      u32 b;
-    } llsig;
-    char Sig[sizeof(u32) << 1];
-  } dev;
-  char data;
-  int i, j, tmp, status = 0;
-  short sigLength;
-  struct bus_type *lp = &bus;
-
-  dev.llsig.a = ETH_PROM_SIG;
-  dev.llsig.b = ETH_PROM_SIG;
-  sigLength = sizeof(u32) << 1;
-
-  if (lp->chipset == DC21040) {
-    for (i=0,j=0;(j<sigLength) && (i<PROBE_LENGTH+sigLength-1);i++) {
-      if (lp->bus == PCI) {
-	while ((tmp = inl(aprom_addr)) < 0);
-	data = (char)tmp;
-      } else {
-	data = inb(aprom_addr);
-      }
-      if (dev.Sig[j] == data) {   /* track signature */
-	j++;
-      } else {                    /* lost signature; begin search again */
-	if (data == dev.Sig[0]) {
-	  j=1;
-	} else {
-	  j=0;
-	}
-      }
-    }
-
-    if (j!=sigLength) {
-      status = -ENODEV;           /* search failed */
-    }
-
-  } else {                        /* use new srom */
-    short *p = (short *)&lp->srom;
-    for (i=0; i<(sizeof(struct de4x5_srom)>>1); i++) {
-      *p++ = srom_rd(aprom_addr, i);
+    c_char *de4x5_signatures[] = DE4X5_SIGNATURE;
+    int i, status = 0, siglen = sizeof(de4x5_signatures)/sizeof(c_char *);
+    
+    if (lp->chipset == DC21040) {
+	strcpy(name, "DE434/5");
+    } else {
+	int i = *((char *)&lp->srom + 19) * 3;
+	if (lp->chipset == DC21041) {
+	    strncpy(name, (char *)&lp->srom + 26 + i, 8);
+	} else if (lp->chipset == DC21140) {
+	    strncpy(name, (char *)&lp->srom + 26 + i, 8);
+	}
+    }
+    name[8] = '\0';
+    for (i=0; i<siglen; i++) {
+	if (strstr(name,de4x5_signatures[i])!=NULL) break;
+    }
+    if (i == siglen) {
+	if (dec_only) {
+	    *name = '\0';
+	} else {
+	    strcpy(name, "UNKNOWN");
+	}
     }
-  }
+    
+    return status;
+}
 
-  return status;
+/*
+** Set up the Ethernet PROM counter to the start of the Ethernet address on
+** the DC21040, else  read the SROM for the other chips.
+*/
+static void DevicePresent(u_long aprom_addr)
+{
+    int i;
+    struct bus_type *lp = &bus;
+    
+    if (lp->chipset == DC21040) {
+	outl(0, aprom_addr);           /* Reset Ethernet Address ROM Pointer */
+    } else {                           /* Read new srom */
+	short *p = (short *)&lp->srom;
+	for (i=0; i<(sizeof(struct de4x5_srom)>>1); i++) {
+	    *p++ = srom_rd(aprom_addr, i);
+	}
+	de4x5_dbg_srom((struct de4x5_srom *)&lp->srom);
+    }
+    
+    return;
 }
 
 static int get_hw_addr(struct device *dev)
 {
-  u_long iobase = dev->base_addr;
-  int i, k, tmp, status = 0;
-  u_short j,chksum;
-  struct bus_type *lp = &bus;
-
-  for (i=0,k=0,j=0;j<3;j++) {
-    k <<= 1 ;
-    if (k > 0xffff) k-=0xffff;
-
+    u_long iobase = dev->base_addr;
+    int broken, i, k, tmp, status = 0;
+    u_short j,chksum;
+    struct bus_type *lp = &bus;
+
+    broken = de4x5_bad_srom(lp);
+    for (i=0,k=0,j=0;j<3;j++) {
+	k <<= 1;
+	if (k > 0xffff) k-=0xffff;
+	
+	if (lp->bus == PCI) {
+	    if (lp->chipset == DC21040) {
+		while ((tmp = inl(DE4X5_APROM)) < 0);
+		k += (u_char) tmp;
+		dev->dev_addr[i++] = (u_char) tmp;
+		while ((tmp = inl(DE4X5_APROM)) < 0);
+		k += (u_short) (tmp << 8);
+		dev->dev_addr[i++] = (u_char) tmp;
+	    } else if (!broken) {
+		dev->dev_addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;
+		dev->dev_addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;
+	    } else if (broken == SMC) {           /* Assume SMC9332 for now */
+		dev->dev_addr[i] = *((u_char *)&lp->srom + i); i++;
+		dev->dev_addr[i] = *((u_char *)&lp->srom + i); i++;
+	    }
+	} else {
+	    k += (u_char) (tmp = inb(EISA_APROM));
+	    dev->dev_addr[i++] = (u_char) tmp;
+	    k += (u_short) ((tmp = inb(EISA_APROM)) << 8);
+	    dev->dev_addr[i++] = (u_char) tmp;
+	}
+	
+	if (k > 0xffff) k-=0xffff;
+    }
+    if (k == 0xffff) k=0;
+    
     if (lp->bus == PCI) {
-      if (lp->chipset == DC21040) {
-	while ((tmp = inl(DE4X5_APROM)) < 0);
-	k += (u_char) tmp;
-	dev->dev_addr[i++] = (u_char) tmp;
-	while ((tmp = inl(DE4X5_APROM)) < 0);
-	k += (u_short) (tmp << 8);
-	dev->dev_addr[i++] = (u_char) tmp;
-      } else {
-	dev->dev_addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;
-	dev->dev_addr[i] = (u_char) lp->srom.ieee_addr[i]; i++;
-      }
-    } else {
-      k += (u_char) (tmp = inb(EISA_APROM));
-      dev->dev_addr[i++] = (u_char) tmp;
-      k += (u_short) ((tmp = inb(EISA_APROM)) << 8);
-      dev->dev_addr[i++] = (u_char) tmp;
-    }
-
-    if (k > 0xffff) k-=0xffff;
-  }
-  if (k == 0xffff) k=0;
+	if (lp->chipset == DC21040) {
+	    while ((tmp = inl(DE4X5_APROM)) < 0);
+	    chksum = (u_char) tmp;
+	    while ((tmp = inl(DE4X5_APROM)) < 0);
+	    chksum |= (u_short) (tmp << 8);
+	    if (k != chksum) status = -1;
+	}
+    } else {
+	chksum = (u_char) inb(EISA_APROM);
+	chksum |= (u_short) (inb(EISA_APROM) << 8);
+	if (k != chksum) status = -1;
+    }
+    
+    return status;
+}
 
-  if (lp->bus == PCI) {
-    if (lp->chipset == DC21040) {
-      while ((tmp = inl(DE4X5_APROM)) < 0);
-      chksum = (u_char) tmp;
-      while ((tmp = inl(DE4X5_APROM)) < 0);
-      chksum |= (u_short) (tmp << 8);
-      if (k != chksum) status = -1;
-    }
-  } else {
-    chksum = (u_char) inb(EISA_APROM);
-    chksum |= (u_short) (inb(EISA_APROM) << 8);
-    if (k != chksum) status = -1;
-  }
+/*
+** Test for enet addresses in the first 32 bytes. The built-in strncmp
+** didn't seem to work here...?
+*/
+static int de4x5_bad_srom(struct bus_type *lp)
+{
+    int i, status = 0;
 
+    for (i=0; i<sizeof(enet_det)/ETH_ALEN; i++) {
+	if (!de4x5_strncmp((char *)&lp->srom, (char *)&enet_det[i], 3) &&
+	    !de4x5_strncmp((char *)&lp->srom+0x10, (char *)&enet_det[i], 3)) {
+	    status = SMC;
+	    break;
+	}
+    }
 
-  return status;
+    return status;
+}
+
+static int de4x5_strncmp(char *a, char *b, int n)
+{
+    int ret=0;
+
+    for (;n && !ret;n--) {
+	ret = *a++ - *b++;
+    }
+
+    return ret;
 }
 
 /*
@@ -2319,466 +2931,928 @@
 */
 static short srom_rd(u_long addr, u_char offset)
 {
-  sendto_srom(SROM_RD | SROM_SR, addr);
+    sendto_srom(SROM_RD | SROM_SR, addr);
+    
+    srom_latch(SROM_RD | SROM_SR | DT_CS, addr);
+    srom_command(SROM_RD | SROM_SR | DT_IN | DT_CS, addr);
+    srom_address(SROM_RD | SROM_SR | DT_CS, addr, offset);
+    
+    return srom_data(SROM_RD | SROM_SR | DT_CS, addr);
+}
 
-  srom_latch(SROM_RD | SROM_SR | DT_CS, addr);
-  srom_command(SROM_RD | SROM_SR | DT_IN | DT_CS, addr);
-  srom_address(SROM_RD | SROM_SR | DT_CS, addr, offset);
+static void srom_latch(u_int command, u_long addr)
+{
+    sendto_srom(command, addr);
+    sendto_srom(command | DT_CLK, addr);
+    sendto_srom(command, addr);
+    
+    return;
+}
+
+static void srom_command(u_int command, u_long addr)
+{
+    srom_latch(command, addr);
+    srom_latch(command, addr);
+    srom_latch((command & 0x0000ff00) | DT_CS, addr);
+    
+    return;
+}
 
-  return srom_data(SROM_RD | SROM_SR | DT_CS, addr);
+static void srom_address(u_int command, u_long addr, u_char offset)
+{
+    int i;
+    char a;
+    
+    a = (char)(offset << 2);
+    for (i=0; i<6; i++, a <<= 1) {
+	srom_latch(command | ((a < 0) ? DT_IN : 0), addr);
+    }
+    de4x5_us_delay(1);
+    
+    i = (getfrom_srom(addr) >> 3) & 0x01;
+    if (i != 0) {
+	printk("Bad SROM address phase.....\n");
+    }
+    
+    return;
+}
+
+static short srom_data(u_int command, u_long addr)
+{
+    int i;
+    short word = 0;
+    s32 tmp;
+    
+    for (i=0; i<16; i++) {
+	sendto_srom(command  | DT_CLK, addr);
+	tmp = getfrom_srom(addr);
+	sendto_srom(command, addr);
+	
+	word = (word << 1) | ((tmp >> 3) & 0x01);
+    }
+    
+    sendto_srom(command & 0x0000ff00, addr);
+    
+    return word;
+}
+
+/*
+static void srom_busy(u_int command, u_long addr)
+{
+   sendto_srom((command & 0x0000ff00) | DT_CS, addr);
+   
+   while (!((getfrom_srom(addr) >> 3) & 0x01)) {
+       de4x5_ms_delay(1);
+   }
+   
+   sendto_srom(command & 0x0000ff00, addr);
+   
+   return;
+}
+*/
+
+static void sendto_srom(u_int command, u_long addr)
+{
+    outl(command, addr);
+    udelay(1);
+    
+    return;
+}
+
+static int getfrom_srom(u_long addr)
+{
+    s32 tmp;
+    
+    tmp = inl(addr);
+    udelay(1);
+    
+    return tmp;
+}
+
+/*
+** MII Read/Write
+*/
+
+static int mii_rd(u_char phyreg, u_char phyaddr, u_long ioaddr)
+{
+    mii_wdata(MII_PREAMBLE,  2, ioaddr);   /* Start of 34 bit preamble...    */
+    mii_wdata(MII_PREAMBLE, 32, ioaddr);   /* ...continued                   */
+    mii_wdata(MII_STRD, 4, ioaddr);        /* SFD and Read operation         */
+    mii_address(phyaddr, ioaddr);          /* PHY address to be accessed     */
+    mii_address(phyreg, ioaddr);           /* PHY Register to read           */
+    mii_ta(MII_STRD, ioaddr);              /* Turn around time - 2 MDC       */
+    
+    return mii_rdata(ioaddr);              /* Read data                      */
+}
+
+static void mii_wr(int data, u_char phyreg, u_char phyaddr, u_long ioaddr)
+{
+    mii_wdata(MII_PREAMBLE,  2, ioaddr);   /* Start of 34 bit preamble...    */
+    mii_wdata(MII_PREAMBLE, 32, ioaddr);   /* ...continued                   */
+    mii_wdata(MII_STWR, 4, ioaddr);        /* SFD and Write operation        */
+    mii_address(phyaddr, ioaddr);          /* PHY address to be accessed     */
+    mii_address(phyreg, ioaddr);           /* PHY Register to write          */
+    mii_ta(MII_STWR, ioaddr);              /* Turn around time - 2 MDC       */
+    data = mii_swap(data, 16);             /* Swap data bit ordering         */
+    mii_wdata(data, 16, ioaddr);           /* Write data                     */
+    
+    return;
+}
+
+static int mii_rdata(u_long ioaddr)
+{
+    int i;
+    s32 tmp = 0;
+    
+    for (i=0; i<16; i++) {
+	tmp <<= 1;
+	tmp |= getfrom_mii(MII_MRD | MII_RD, ioaddr);
+    }
+    
+    return tmp;
+}
+
+static void mii_wdata(int data, int len, u_long ioaddr)
+{
+    int i;
+    
+    for (i=0; i<len; i++) {
+	sendto_mii(MII_MWR | MII_WR, data, ioaddr);
+	data >>= 1;
+    }
+    
+    return;
+}
+
+static void mii_address(u_char addr, u_long ioaddr)
+{
+    int i;
+    
+    addr = mii_swap(addr, 5);
+    for (i=0; i<5; i++) {
+	sendto_mii(MII_MWR | MII_WR, addr, ioaddr);
+	addr >>= 1;
+    }
+    
+    return;
 }
 
-static void srom_latch(u_int command, u_long addr)
+static void mii_ta(u_long rw, u_long ioaddr)
 {
-  sendto_srom(command, addr);
-  sendto_srom(command | DT_CLK, addr);
-  sendto_srom(command, addr);
-
-  return;
+    if (rw == MII_STWR) {
+	sendto_mii(MII_MWR | MII_WR, 1, ioaddr);  
+	getfrom_mii(MII_MRD | MII_RD, ioaddr);
+    } else {
+	getfrom_mii(MII_MRD | MII_RD, ioaddr);        /* Tri-state MDIO */
+    }
+    
+    return;
 }
 
-static void srom_command(u_int command, u_long addr)
+static int mii_swap(int data, int len)
 {
-  srom_latch(command, addr);
-  srom_latch(command, addr);
-  srom_latch((command & 0x0000ff00) | DT_CS, addr);
-
-  return;
+    int i, tmp = 0;
+    
+    for (i=0; i<len; i++) {
+	tmp <<= 1;
+	tmp |= (data & 1);
+	data >>= 1;
+    }
+    
+    return tmp;
 }
 
-static void srom_address(u_int command, u_long addr, u_char offset)
+static void sendto_mii(u32 command, int data, u_long ioaddr)
 {
-  int i;
-  char a;
-
-  a = (char)(offset << 2);
-  for (i=0; i<6; i++, a <<= 1) {
-    srom_latch(command | ((a < 0) ? DT_IN : 0), addr);
-  }
-  dce_us_delay(1);
-
-  i = (getfrom_srom(addr) >> 3) & 0x01;
-  if (i != 0) {
-    printk("Bad SROM address phase.....\n");
-/*    printk(".");*/
-  }
-
-  return;
+    u32 j;
+    
+    j = (data & 1) << 17;
+    outl(command | j, ioaddr);
+    udelay(1);
+    outl(command | MII_MDC | j, ioaddr);
+    udelay(1);
+    
+    return;
 }
 
-static short srom_data(u_int command, u_long addr)
+static int getfrom_mii(u32 command, u_long ioaddr)
 {
-  int i;
-  short word = 0;
-  s32 tmp;
-
-  for (i=0; i<16; i++) {
-    sendto_srom(command  | DT_CLK, addr);
-    tmp = getfrom_srom(addr);
-    sendto_srom(command, addr);
-
-    word = (word << 1) | ((tmp >> 3) & 0x01);
-  }
-
-  sendto_srom(command & 0x0000ff00, addr);
-
-  return word;
+    outl(command, ioaddr);
+    udelay(1);
+    outl(command | MII_MDC, ioaddr);
+    udelay(1);
+    
+    return ((inl(ioaddr) >> 19) & 1);
 }
 
 /*
-static void srom_busy(u_int command, u_long addr)
+** Here's 3 ways to calculate the OUI from the ID registers. One's a brain
+** dead approach, 2 aren't (clue: mine isn't!).
+*/
+static int mii_get_oui(u_char phyaddr, u_long ioaddr)
 {
-  sendto_srom((command & 0x0000ff00) | DT_CS, addr);
+/*
+    union {
+	u_short reg;
+	u_char breg[2];
+    } a;
+    int i, r2, r3, ret=0;*/
+    int r2, r3;
 
-  while (!((getfrom_srom(addr) >> 3) & 0x01)) {
-    dce_ms_delay(1);
-  }
+    /* Read r2 and r3 */
+    r2 = mii_rd(MII_ID0, phyaddr, ioaddr);
+    r3 = mii_rd(MII_ID1, phyaddr, ioaddr);
+                                                /* SEEQ and Cypress way * /
+    / * Shuffle r2 and r3 * /
+    a.reg=0;
+    r3 = ((r3>>10)|(r2<<6))&0x0ff;
+    r2 = ((r2>>2)&0x3fff);
 
-  sendto_srom(command & 0x0000ff00, addr);
+    / * Bit reverse r3 * /
+    for (i=0;i<8;i++) {
+	ret<<=1;
+	ret |= (r3&1);
+	r3>>=1;
+    }
 
-  return;
-}
-*/
+    / * Bit reverse r2 * /
+    for (i=0;i<16;i++) {
+	a.reg<<=1;
+	a.reg |= (r2&1);
+	r2>>=1;
+    }
 
-static void sendto_srom(u_int command, u_long addr)
-{
-  outl(command, addr);
-  dce_us_delay(1);
+    / * Swap r2 bytes * /
+    i=a.breg[0];
+    a.breg[0]=a.breg[1];
+    a.breg[1]=i;
 
-  return;
+    return ((a.reg<<8)|ret); */                 /* SEEQ and Cypress way */
+/*    return ((r2<<6)|(u_int)(r3>>10)); */      /* NATIONAL and BROADCOM way */
+    return r2;                                  /* (I did it) My way */
 }
 
-static int getfrom_srom(u_long addr)
+static int mii_get_phy(struct device *dev)
 {
-  s32 tmp;
-
-  tmp = inl(addr);
-  dce_us_delay(1);
-
-  return tmp;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int iobase = dev->base_addr;
+    int i, j, k, limit=sizeof(phy_info)/sizeof(struct phy_table);
+    int id;
+    
+    /* Issue a hard PHY reset - Broadcom is screwed up otherwise */
+    outl(GEP_HRST, DE4X5_GEP);
+    udelay(1000);                                  /* Assert for 1ms */
+    outl(0x00, DE4X5_GEP);
+    udelay(2000);                                  /* Wait for 2ms */
+    
+    /* Search the MII address space for possible PHY devices */
+    lp->active = 0;
+    for (lp->mii_cnt=0, i=1; i<DE4X5_MAX_MII; i++) {
+	id = mii_get_oui(i, DE4X5_MII); 
+	if ((id == 0) || (id == -1)) continue;     /* Valid ID? */
+	for (j=0; j<limit; j++) {                  /* Search PHY table */
+	    if (id != phy_info[j].id) continue;    /* ID match? */
+	    for (k=0; lp->phy[k].id && (k < DE4X5_MAX_PHY); k++);
+	    if (k < DE4X5_MAX_PHY) {
+		memcpy((char *)&lp->phy[k],
+		       (char *)&phy_info[j], sizeof(struct phy_table));
+		lp->phy[k].addr = i;
+		lp->mii_cnt++;
+	    } else {
+		i = DE4X5_MAX_MII;                 /* Stop the search */
+		j = limit;
+	    }
+	}
+    }
+    if (lp->phy[lp->active].id) {                  /* Reset the PHY devices */
+	for (k=0; lp->phy[k].id && (k < DE4X5_MAX_PHY); k++) { /*For each PHY*/
+	    mii_wr(MII_CR_RST, MII_CR, lp->phy[k].addr, DE4X5_MII);
+	    while (mii_rd(MII_CR, lp->phy[k].addr, DE4X5_MII) & MII_CR_RST);
+	    
+	    de4x5_dbg_mii(dev, k);
+	}
+    }
+    
+    return lp->mii_cnt;
 }
 
 static char *build_setup_frame(struct device *dev, int mode)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  int i;
-  char *pa = lp->setup_frame;
-
-  /* Initialise the setup frame */
-  if (mode == ALL) {
-    memset(lp->setup_frame, 0, SETUP_FRAME_LEN);
-  }
-
-  if (lp->setup_f == HASH_PERF) {
-    for (pa=lp->setup_frame+IMPERF_PA_OFFSET, i=0; i<ETH_ALEN; i++) {
-      *(pa + i) = dev->dev_addr[i];                 /* Host address */
-      if (i & 0x01) pa += 2;
-    }
-    *(lp->setup_frame + (HASH_TABLE_LEN >> 3) - 3) = 0x80; /* B'cast address */
-  } else {
-    for (i=0; i<ETH_ALEN; i++) { /* Host address */
-      *(pa + (i&1)) = dev->dev_addr[i];
-      if (i & 0x01) pa += 4;
-    }
-    for (i=0; i<ETH_ALEN; i++) { /* Broadcast address */
-      *(pa + (i&1)) = (char) 0xff;
-      if (i & 0x01) pa += 4;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int i;
+    char *pa = lp->setup_frame;
+    
+    /* Initialise the setup frame */
+    if (mode == ALL) {
+	memset(lp->setup_frame, 0, SETUP_FRAME_LEN);
     }
-  }
-
-  return pa;                     /* Points to the next entry */
+    
+    if (lp->setup_f == HASH_PERF) {
+	for (pa=lp->setup_frame+IMPERF_PA_OFFSET, i=0; i<ETH_ALEN; i++) {
+	    *(pa + i) = dev->dev_addr[i];                 /* Host address */
+	    if (i & 0x01) pa += 2;
+	}
+	*(lp->setup_frame + (HASH_TABLE_LEN >> 3) - 3) = 0x80;
+    } else {
+	for (i=0; i<ETH_ALEN; i++) { /* Host address */
+	    *(pa + (i&1)) = dev->dev_addr[i];
+	    if (i & 0x01) pa += 4;
+	}
+	for (i=0; i<ETH_ALEN; i++) { /* Broadcast address */
+	    *(pa + (i&1)) = (char) 0xff;
+	    if (i & 0x01) pa += 4;
+	}
+    }
+    
+    return pa;                     /* Points to the next entry */
 }
 
 static void enable_ast(struct device *dev, u32 time_out)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-
-  lp->irq_mask |= IMR_TMM;
-  outl(lp->irq_mask, DE4X5_IMR);
-  load_ms_timer(dev, time_out);
-
-  return;
+    timeout(dev, (void *)&de4x5_ast, (u_long)dev, time_out);
+    
+    return;
 }
 
 static void disable_ast(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  u_long iobase = dev->base_addr;
-
-  lp->irq_mask &= ~IMR_TMM;
-  outl(lp->irq_mask, DE4X5_IMR);
-  load_ms_timer(dev, 0);
-
-  return;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    
+    del_timer(&lp->timer);
+    
+    return;
 }
 
-static void kick_tx(struct device *dev)
+static long de4x5_switch_to_mii(struct device *dev)
 {
-  struct sk_buff *skb;
-
-  if ((skb = alloc_skb(0, GFP_ATOMIC)) != NULL) {
-    skb->len= FAKE_FRAME_LEN;
-    skb->arp=1;
-    skb->dev=dev;
-    dev_queue_xmit(skb, dev, SOPRI_NORMAL);
-  }
-
-  return;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int iobase = dev->base_addr;
+    long omr;
+    
+    /* Assert the OMR_PS bit in CSR6 */
+    omr = (inl(DE4X5_OMR) & ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR));
+    omr |= (OMR_PS | OMR_HBD);
+    outl(omr, DE4X5_OMR);
+    
+    /* Soft Reset */
+    RESET_DE4X5;
+    
+    /* Restore the GEP */
+    if (lp->chipset == DC21140) {
+	outl(GEP_INIT, DE4X5_GEP);
+	outl(0, DE4X5_GEP);
+    }
+    
+    /* Restore CSR6 */
+    outl(omr, DE4X5_OMR);
+    
+    return omr;
 }
 
-/*
-** Perform IOCTL call functions here. Some are privileged operations and the
-** effective uid is checked in those cases.
-*/
-static int de4x5_ioctl(struct device *dev, struct ifreq *rq, int cmd)
+static long de4x5_switch_to_srl(struct device *dev)
 {
-  struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
-  struct de4x5_ioctl *ioc = (struct de4x5_ioctl *) &rq->ifr_data;
-  u_long iobase = dev->base_addr;
-  int i, j, status = 0;
-  s32 omr;
-  union {
-    u8  addr[(HASH_TABLE_LEN * ETH_ALEN)];
-    u16 sval[(HASH_TABLE_LEN * ETH_ALEN) >> 1];
-    u32 lval[(HASH_TABLE_LEN * ETH_ALEN) >> 2];
-  } tmp;
-
-  switch(ioc->cmd) {
-  case DE4X5_GET_HWADDR:             /* Get the hardware address */
-    ioc->len = ETH_ALEN;
-    status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len);
-    if (status)
-      break;
-    for (i=0; i<ETH_ALEN; i++) {
-      tmp.addr[i] = dev->dev_addr[i];
-    }
-    memcpy_tofs(ioc->data, tmp.addr, ioc->len);
-    
-    break;
-  case DE4X5_SET_HWADDR:             /* Set the hardware address */
-    status = verify_area(VERIFY_READ, (void *)ioc->data, ETH_ALEN);
-    if (status)
-      break;
-    status = -EPERM;
-    if (!suser())
-      break;
-    status = 0;
-    memcpy_fromfs(tmp.addr, ioc->data, ETH_ALEN);
-    for (i=0; i<ETH_ALEN; i++) {
-      dev->dev_addr[i] = tmp.addr[i];
-    }
-    build_setup_frame(dev, PHYS_ADDR_ONLY);
-    /* Set up the descriptor and give ownership to the card */
-    while (set_bit(0, (void *)&dev->tbusy) != 0);/* Wait for lock to free*/
-    if (lp->setup_f == HASH_PERF) {
-      load_packet(dev, lp->setup_frame, TD_IC | HASH_F | TD_SET | 
-    	                                        SETUP_FRAME_LEN, NULL);
-    } else {
-      load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET | 
-    	                                        SETUP_FRAME_LEN, NULL);
-    }
-    lp->tx_new = (++lp->tx_new) % lp->txRingSize;
-    outl(POLL_DEMAND, DE4X5_TPD);                /* Start the TX */
-    dev->tbusy = 0;                              /* Unlock the TX ring */
-
-    break;
-  case DE4X5_SET_PROM:               /* Set Promiscuous Mode */
-    if (suser()) {
-      omr = inl(DE4X5_OMR);
-      omr |= OMR_PR;
-      outl(omr, DE4X5_OMR);
-    } else {
-      status = -EPERM;
-    }
-
-    break;
-  case DE4X5_CLR_PROM:               /* Clear Promiscuous Mode */
-    if (suser()) {
-      omr = inl(DE4X5_OMR);
-      omr &= ~OMR_PR;
-      outb(omr, DE4X5_OMR);
-    } else {
-      status = -EPERM;
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int iobase = dev->base_addr;
+    long omr;
+    
+    /* Deassert the OMR_PS bit in CSR6 */
+    omr = (inl(DE4X5_OMR) & ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR));
+    outl(omr | OMR_TTM, DE4X5_OMR);
+    outl(omr, DE4X5_OMR);
+    
+    /* Soft Reset */
+    RESET_DE4X5;
+    
+    /* Restore the GEP */
+    if (lp->chipset == DC21140) {
+	outl(GEP_INIT, DE4X5_GEP);
+	outl(0, DE4X5_GEP);
     }
+    
+    /* Restore CSR6 */
+    outl(omr, DE4X5_OMR);
+    
+    return omr;
+}
 
-    break;
-  case DE4X5_SAY_BOO:                /* Say "Boo!" to the kernel log file */
-    printk("%s: Boo!\n", dev->name);
-
-    break;
-  case DE4X5_GET_MCA:                /* Get the multicast address table */
-    ioc->len = (HASH_TABLE_LEN >> 3);
-    status = verify_area(VERIFY_WRITE, ioc->data, ioc->len);
-    if (status)
-      break;
-    memcpy_tofs(ioc->data, lp->setup_frame, ioc->len); 
+static void timeout(struct device *dev, void (*fn)(u_long data), u_long data, u_long msec)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int dt;
+    
+    /* First, cancel any pending timer events */
+    del_timer(&lp->timer);
+    
+    /* Convert msec to ticks */
+    dt = (msec * HZ) / 1000;
+    if (dt==0) dt=1;
+    
+    /* Set up timer */
+    lp->timer.expires = jiffies + dt;
+    lp->timer.function = fn;
+    lp->timer.data = data;
+    add_timer(&lp->timer);
+    
+    return;
+}
 
-    break;
-  case DE4X5_SET_MCA:                /* Set a multicast address */
-    if (suser()) {
-      if (ioc->len != HASH_TABLE_LEN) {         /* MCA changes */
-	if (!(status = verify_area(VERIFY_READ, (void *)ioc->data, ETH_ALEN * ioc->len))) {
-	  memcpy_fromfs(tmp.addr, ioc->data, ETH_ALEN * ioc->len);
-	  set_multicast_list(dev);
+static void de4x5_dbg_open(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int i;
+    
+    if (de4x5_debug > 1) {
+	printk("%s: de4x5 opening with irq %d\n",dev->name,dev->irq);
+	printk("\tphysical address: ");
+	for (i=0;i<6;i++) {
+	    printk("%2.2x:",(short)dev->dev_addr[i]);
+	}
+	printk("\n");
+	printk("Descriptor head addresses:\n");
+	printk("\t0x%8.8lx  0x%8.8lx\n",(u_long)lp->rx_ring,(u_long)lp->tx_ring);
+	printk("Descriptor addresses:\nRX: ");
+	for (i=0;i<lp->rxRingSize-1;i++){
+	    if (i < 3) {
+		printk("0x%8.8lx  ",(u_long)&lp->rx_ring[i].status);
+	    }
 	}
-      } else {
-	set_multicast_list(dev);
-      }
-    } else {
-      status = -EPERM;
+	printk("...0x%8.8lx\n",(u_long)&lp->rx_ring[i].status);
+	printk("TX: ");
+	for (i=0;i<lp->txRingSize-1;i++){
+	    if (i < 3) {
+		printk("0x%8.8lx  ", (u_long)&lp->tx_ring[i].status);
+	    }
+	}
+	printk("...0x%8.8lx\n", (u_long)&lp->tx_ring[i].status);
+	printk("Descriptor buffers:\nRX: ");
+	for (i=0;i<lp->rxRingSize-1;i++){
+	    if (i < 3) {
+		printk("0x%8.8x  ",lp->rx_ring[i].buf);
+	    }
+	}
+	printk("...0x%8.8x\n",lp->rx_ring[i].buf);
+	printk("TX: ");
+	for (i=0;i<lp->txRingSize-1;i++){
+	    if (i < 3) {
+		printk("0x%8.8x  ", lp->tx_ring[i].buf);
+	    }
+	}
+	printk("...0x%8.8x\n", lp->tx_ring[i].buf);
+	printk("Ring size: \nRX: %d\nTX: %d\n", 
+	       (short)lp->rxRingSize, 
+	       (short)lp->txRingSize); 
     }
+    
+    return;
+}
 
-    break;
-  case DE4X5_CLR_MCA:                /* Clear all multicast addresses */
-    if (suser()) {
-      set_multicast_list(dev);
-    } else {
-      status = -EPERM;
+static void de4x5_dbg_mii(struct device *dev, int k)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    int iobase = dev->base_addr;
+    
+    if (de4x5_debug > 2) {
+	printk("\nMII CR:  %x\n",mii_rd(MII_CR,lp->phy[k].addr,DE4X5_MII));
+	printk("MII SR:  %x\n",mii_rd(MII_SR,lp->phy[k].addr,DE4X5_MII));
+	printk("MII ID0: %x\n",mii_rd(MII_ID0,lp->phy[k].addr,DE4X5_MII));
+	printk("MII ID1: %x\n",mii_rd(MII_ID1,lp->phy[k].addr,DE4X5_MII));
+	if (lp->phy[k].id != BROADCOM_T4) {
+	    printk("MII ANA: %x\n",mii_rd(0x04,lp->phy[k].addr,DE4X5_MII));
+	    printk("MII ANC: %x\n",mii_rd(0x05,lp->phy[k].addr,DE4X5_MII));
+	}
+	printk("MII 16:  %x\n",mii_rd(0x10,lp->phy[k].addr,DE4X5_MII));
+	if (lp->phy[k].id != BROADCOM_T4) {
+	    printk("MII 17:  %x\n",mii_rd(0x11,lp->phy[k].addr,DE4X5_MII));
+	    printk("MII 18:  %x\n",mii_rd(0x12,lp->phy[k].addr,DE4X5_MII));
+	} else {
+	    printk("MII 20:  %x\n",mii_rd(0x14,lp->phy[k].addr,DE4X5_MII));
+	}
     }
+    
+    return;
+}
 
-    break;
-  case DE4X5_MCA_EN:                 /* Enable pass all multicast addressing */
-    if (suser()) {
-      omr = inl(DE4X5_OMR);
-      omr |= OMR_PM;
-      outl(omr, DE4X5_OMR);
-    } else {
-      status = -EPERM;
+static void de4x5_dbg_media(struct device *dev)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    
+    if (lp->media != lp->c_media) {
+	if (de4x5_debug > 0) {
+	    if (lp->chipset != DC21140) {
+		printk("%s: media is %s\n", dev->name,
+		       (lp->media == NC  ? "unconnected!" :
+			(lp->media == TP  ? "TP." :
+			 (lp->media == ANS ? "TP/Nway." :
+			  (lp->media == BNC ? "BNC." : 
+			   (lp->media == BNC_AUI ? "BNC/AUI." : 
+			    (lp->media == EXT_SIA ? "EXT SIA." : 
+			     "???."
+			     )))))));
+	    } else {
+		printk("%s: mode is %s\n", dev->name,
+		    (lp->media == NC ? "link down or incompatible connection.":
+		     (lp->media == _100Mb  ? "100Mb/s." :
+		      (lp->media == _10Mb   ? "10Mb/s." :
+		       "\?\?\?"
+		       ))));
+	    }
+	}
+	lp->c_media = lp->media;
     }
+    
+    return;
+}
 
-    break;
-  case DE4X5_GET_STATS:              /* Get the driver statistics */
-    ioc->len = sizeof(lp->pktStats);
-    status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len);
-    if (status)
-      break;
-
-    cli();
-    memcpy_tofs(ioc->data, &lp->pktStats, ioc->len); 
-    sti();
+static void de4x5_dbg_srom(struct de4x5_srom *p)
+{
+    int i;
 
-    break;
-  case DE4X5_CLR_STATS:              /* Zero out the driver statistics */
-    if (suser()) {
-      cli();
-      memset(&lp->pktStats, 0, sizeof(lp->pktStats));
-      sti();
-    } else {
-      status = -EPERM;
-    }
-
-    break;
-  case DE4X5_GET_OMR:                /* Get the OMR Register contents */
-    tmp.addr[0] = inl(DE4X5_OMR);
-    if (!(status = verify_area(VERIFY_WRITE, (void *)ioc->data, 1))) {
-      memcpy_tofs(ioc->data, tmp.addr, 1);
-    }
-
-    break;
-  case DE4X5_SET_OMR:                /* Set the OMR Register contents */
-    if (suser()) {
-      if (!(status = verify_area(VERIFY_READ, (void *)ioc->data, 1))) {
-	memcpy_fromfs(tmp.addr, ioc->data, 1);
-	outl(tmp.addr[0], DE4X5_OMR);
-      }
-    } else {
-      status = -EPERM;
-    }
-
-    break;
-  case DE4X5_GET_REG:                /* Get the DE4X5 Registers */
-    j = 0;
-    tmp.lval[0] = inl(DE4X5_STS); j+=4;
-    tmp.lval[1] = inl(DE4X5_BMR); j+=4;
-    tmp.lval[2] = inl(DE4X5_IMR); j+=4;
-    tmp.lval[3] = inl(DE4X5_OMR); j+=4;
-    tmp.lval[4] = inl(DE4X5_SISR); j+=4;
-    tmp.lval[5] = inl(DE4X5_SICR); j+=4;
-    tmp.lval[6] = inl(DE4X5_STRR); j+=4;
-    tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
-    ioc->len = j;
-    if (!(status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len))) {
-      memcpy_tofs(ioc->data, tmp.addr, ioc->len);
+    if (de4x5_debug > 1) {
+	printk("Sub-system Vendor ID: %04x\n", (u_short)*(p->sub_vendor_id));
+	printk("Sub-system ID:        %04x\n", (u_short)*(p->sub_system_id));
+	printk("ID Block CRC:         %02x\n", (u_char)(p->id_block_crc));
+
+	printk("Hardware Address:     ");
+	for (i=0;i<ETH_ALEN-1;i++) {
+	    printk("%02x:", (u_char)*(p->ieee_addr+i));
+	}
+	printk("%02x\n", (u_char)*(p->ieee_addr+i));
+	printk("CRC checksum:         %04x\n", (u_short)(p->chksum));
+	for (i=0; i<64; i++) {
+	    printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i));
+	}
     }
-    break;
-
-#define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */
 
-  case DE4X5_DUMP:
-    j = 0;
-    tmp.addr[j++] = dev->irq;
-    for (i=0; i<ETH_ALEN; i++) {
-      tmp.addr[j++] = dev->dev_addr[i];
-    }
-    tmp.addr[j++] = lp->rxRingSize;
-    tmp.lval[j>>2] = (long)lp->rx_ring; j+=4;
-    tmp.lval[j>>2] = (long)lp->tx_ring; j+=4;
+    return;
+}
 
-    for (i=0;i<lp->rxRingSize-1;i++){
-      if (i < 3) {
+/*
+** Perform IOCTL call functions here. Some are privileged operations and the
+** effective uid is checked in those cases.
+*/
+static int de4x5_ioctl(struct device *dev, struct ifreq *rq, int cmd)
+{
+    struct de4x5_private *lp = (struct de4x5_private *)dev->priv;
+    struct de4x5_ioctl *ioc = (struct de4x5_ioctl *) &rq->ifr_data;
+    u_long iobase = dev->base_addr;
+    int i, j, status = 0;
+    s32 omr;
+    union {
+	u8  addr[(HASH_TABLE_LEN * ETH_ALEN)];
+	u16 sval[(HASH_TABLE_LEN * ETH_ALEN) >> 1];
+	u32 lval[(HASH_TABLE_LEN * ETH_ALEN) >> 2];
+    } tmp;
+    
+    switch(ioc->cmd) {
+      case DE4X5_GET_HWADDR:           /* Get the hardware address */
+	ioc->len = ETH_ALEN;
+	status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len);
+	if (status)
+	  break;
+	for (i=0; i<ETH_ALEN; i++) {
+	    tmp.addr[i] = dev->dev_addr[i];
+	}
+	memcpy_tofs(ioc->data, tmp.addr, ioc->len);
+	
+	break;
+      case DE4X5_SET_HWADDR:           /* Set the hardware address */
+	status = verify_area(VERIFY_READ, (void *)ioc->data, ETH_ALEN);
+	if (status)
+	  break;
+	status = -EPERM;
+	if (!suser())
+	  break;
+	status = 0;
+	memcpy_fromfs(tmp.addr, ioc->data, ETH_ALEN);
+	for (i=0; i<ETH_ALEN; i++) {
+	    dev->dev_addr[i] = tmp.addr[i];
+	}
+	build_setup_frame(dev, PHYS_ADDR_ONLY);
+	/* Set up the descriptor and give ownership to the card */
+	while (set_bit(0, (void *)&dev->tbusy) != 0);/* Wait for lock to free*/
+	if (lp->setup_f == HASH_PERF) {
+	    load_packet(dev, lp->setup_frame, TD_IC | HASH_F | TD_SET | 
+			SETUP_FRAME_LEN, NULL);
+	} else {
+	    load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET | 
+			SETUP_FRAME_LEN, NULL);
+	}
+	lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+	outl(POLL_DEMAND, DE4X5_TPD);                /* Start the TX */
+	dev->tbusy = 0;                              /* Unlock the TX ring */
+	
+	break;
+      case DE4X5_SET_PROM:             /* Set Promiscuous Mode */
+	if (suser()) {
+	    omr = inl(DE4X5_OMR);
+	    omr |= OMR_PR;
+	    outl(omr, DE4X5_OMR);
+	} else {
+	    status = -EPERM;
+	}
+	
+	break;
+      case DE4X5_CLR_PROM:             /* Clear Promiscuous Mode */
+	if (suser()) {
+	    omr = inl(DE4X5_OMR);
+	    omr &= ~OMR_PR;
+	    outb(omr, DE4X5_OMR);
+	} else {
+	    status = -EPERM;
+	}
+	
+	break;
+      case DE4X5_SAY_BOO:              /* Say "Boo!" to the kernel log file */
+	printk("%s: Boo!\n", dev->name);
+	
+	break;
+      case DE4X5_GET_MCA:              /* Get the multicast address table */
+	ioc->len = (HASH_TABLE_LEN >> 3);
+	status = verify_area(VERIFY_WRITE, ioc->data, ioc->len);
+	if (!status) {
+	    memcpy_tofs(ioc->data, lp->setup_frame, ioc->len); 
+	}
+	
+	break;
+      case DE4X5_SET_MCA:              /* Set a multicast address */
+	if (suser()) {
+	    /******* FIX ME! ********/
+	    if (ioc->len != HASH_TABLE_LEN) {         /* MCA changes */
+		if (!(status = verify_area(VERIFY_READ, (void *)ioc->data, ETH_ALEN * ioc->len))) {
+		    memcpy_fromfs(tmp.addr, ioc->data, ETH_ALEN * ioc->len);
+		    set_multicast_list(dev);
+		}
+	    } else {
+		set_multicast_list(dev);
+	    }
+	} else {
+	    status = -EPERM;
+	}
+	
+	break;
+      case DE4X5_CLR_MCA:              /* Clear all multicast addresses */
+	if (suser()) {
+	    /******* FIX ME! ********/
+	    set_multicast_list(dev);
+	} else {
+	    status = -EPERM;
+	}
+	
+	break;
+      case DE4X5_MCA_EN:               /* Enable pass all multicast addressing */
+	if (suser()) {
+	    omr = inl(DE4X5_OMR);
+	    omr |= OMR_PM;
+	    outl(omr, DE4X5_OMR);
+	} else {
+	    status = -EPERM;
+	}
+	
+	break;
+      case DE4X5_GET_STATS:            /* Get the driver statistics */
+	ioc->len = sizeof(lp->pktStats);
+	status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len);
+	if (status)
+	  break;
+	
+	cli();
+	memcpy_tofs(ioc->data, &lp->pktStats, ioc->len); 
+	sti();
+	
+	break;
+      case DE4X5_CLR_STATS:            /* Zero out the driver statistics */
+	if (suser()) {
+	    cli();
+	    memset(&lp->pktStats, 0, sizeof(lp->pktStats));
+	    sti();
+	} else {
+	    status = -EPERM;
+	}
+	
+	break;
+      case DE4X5_GET_OMR:              /* Get the OMR Register contents */
+	tmp.addr[0] = inl(DE4X5_OMR);
+	if (!(status = verify_area(VERIFY_WRITE, (void *)ioc->data, 1))) {
+	    memcpy_tofs(ioc->data, tmp.addr, 1);
+	}
+	
+	break;
+      case DE4X5_SET_OMR:              /* Set the OMR Register contents */
+	if (suser()) {
+	    if (!(status = verify_area(VERIFY_READ, (void *)ioc->data, 1))) {
+		memcpy_fromfs(tmp.addr, ioc->data, 1);
+		outl(tmp.addr[0], DE4X5_OMR);
+	    }
+	} else {
+	    status = -EPERM;
+	}
+	
+	break;
+      case DE4X5_GET_REG:              /* Get the DE4X5 Registers */
+	j = 0;
+	tmp.lval[0] = inl(DE4X5_STS); j+=4;
+	tmp.lval[1] = inl(DE4X5_BMR); j+=4;
+	tmp.lval[2] = inl(DE4X5_IMR); j+=4;
+	tmp.lval[3] = inl(DE4X5_OMR); j+=4;
+	tmp.lval[4] = inl(DE4X5_SISR); j+=4;
+	tmp.lval[5] = inl(DE4X5_SICR); j+=4;
+	tmp.lval[6] = inl(DE4X5_STRR); j+=4;
+	tmp.lval[7] = inl(DE4X5_SIGR); j+=4;
+	ioc->len = j;
+	if (!(status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len))) {
+	    memcpy_tofs(ioc->data, tmp.addr, ioc->len);
+	}
+	break;
+	
+#define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */
+	
+      case DE4X5_DUMP:
+	j = 0;
+	tmp.addr[j++] = dev->irq;
+	for (i=0; i<ETH_ALEN; i++) {
+	    tmp.addr[j++] = dev->dev_addr[i];
+	}
+	tmp.addr[j++] = lp->rxRingSize;
+	tmp.lval[j>>2] = (long)lp->rx_ring; j+=4;
+	tmp.lval[j>>2] = (long)lp->tx_ring; j+=4;
+	
+	for (i=0;i<lp->rxRingSize-1;i++){
+	    if (i < 3) {
+		tmp.lval[j>>2] = (long)&lp->rx_ring[i].status; j+=4;
+	    }
+	}
 	tmp.lval[j>>2] = (long)&lp->rx_ring[i].status; j+=4;
-      }
-    }
-    tmp.lval[j>>2] = (long)&lp->rx_ring[i].status; j+=4;
-    for (i=0;i<lp->txRingSize-1;i++){
-      if (i < 3) {
+	for (i=0;i<lp->txRingSize-1;i++){
+	    if (i < 3) {
+		tmp.lval[j>>2] = (long)&lp->tx_ring[i].status; j+=4;
+	    }
+	}
 	tmp.lval[j>>2] = (long)&lp->tx_ring[i].status; j+=4;
-      }
-    }
-    tmp.lval[j>>2] = (long)&lp->tx_ring[i].status; j+=4;
-      
-    for (i=0;i<lp->rxRingSize-1;i++){
-      if (i < 3) {
+	
+	for (i=0;i<lp->rxRingSize-1;i++){
+	    if (i < 3) {
+		tmp.lval[j>>2] = (s32)lp->rx_ring[i].buf; j+=4;
+	    }
+	}
 	tmp.lval[j>>2] = (s32)lp->rx_ring[i].buf; j+=4;
-      }
-    }
-    tmp.lval[j>>2] = (s32)lp->rx_ring[i].buf; j+=4;
-    for (i=0;i<lp->txRingSize-1;i++){
-      if (i < 3) {
+	for (i=0;i<lp->txRingSize-1;i++){
+	    if (i < 3) {
+		tmp.lval[j>>2] = (s32)lp->tx_ring[i].buf; j+=4;
+	    }
+	}
 	tmp.lval[j>>2] = (s32)lp->tx_ring[i].buf; j+=4;
-      }
+	
+	for (i=0;i<lp->rxRingSize;i++){
+	    tmp.lval[j>>2] = lp->rx_ring[i].status; j+=4;
+	}
+	for (i=0;i<lp->txRingSize;i++){
+	    tmp.lval[j>>2] = lp->tx_ring[i].status; j+=4;
+	}
+	
+	tmp.lval[j>>2] = inl(DE4X5_BMR);  j+=4;
+	tmp.lval[j>>2] = inl(DE4X5_TPD);  j+=4;
+	tmp.lval[j>>2] = inl(DE4X5_RPD);  j+=4;
+	tmp.lval[j>>2] = inl(DE4X5_RRBA); j+=4;
+	tmp.lval[j>>2] = inl(DE4X5_TRBA); j+=4;
+	tmp.lval[j>>2] = inl(DE4X5_STS);  j+=4;
+	tmp.lval[j>>2] = inl(DE4X5_OMR);  j+=4;
+	tmp.lval[j>>2] = inl(DE4X5_IMR);  j+=4;
+	tmp.lval[j>>2] = lp->chipset; j+=4; 
+	if (lp->chipset == DC21140) {
+	    tmp.lval[j>>2] = inl(DE4X5_GEP);  j+=4;
+	} else {
+	    tmp.lval[j>>2] = inl(DE4X5_SISR); j+=4;
+	    tmp.lval[j>>2] = inl(DE4X5_SICR); j+=4;
+	    tmp.lval[j>>2] = inl(DE4X5_STRR); j+=4;
+	    tmp.lval[j>>2] = inl(DE4X5_SIGR); j+=4; 
+	}
+	tmp.lval[j>>2] = lp->phy[lp->active].id; j+=4; 
+	if (lp->phy[lp->active].id) {
+	    tmp.lval[j>>2] = lp->active; j+=4; 
+	    tmp.lval[j>>2]=mii_rd(MII_CR,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    tmp.lval[j>>2]=mii_rd(MII_SR,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    tmp.lval[j>>2]=mii_rd(MII_ID0,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    tmp.lval[j>>2]=mii_rd(MII_ID1,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    if (lp->phy[lp->active].id != BROADCOM_T4) {
+		tmp.lval[j>>2]=mii_rd(MII_ANA,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+		tmp.lval[j>>2]=mii_rd(MII_ANLPA,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    }
+	    tmp.lval[j>>2]=mii_rd(0x10,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    if (lp->phy[lp->active].id != BROADCOM_T4) {
+		tmp.lval[j>>2]=mii_rd(0x11,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+		tmp.lval[j>>2]=mii_rd(0x12,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    } else {
+		tmp.lval[j>>2]=mii_rd(0x14,lp->phy[lp->active].addr,DE4X5_MII); j+=4;
+	    }
+	}
+	
+	tmp.addr[j++] = lp->txRingSize;
+	tmp.addr[j++] = dev->tbusy;
+	
+	ioc->len = j;
+	if (!(status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len))) {
+	    memcpy_tofs(ioc->data, tmp.addr, ioc->len);
+	}
+	
+	break;
+      default:
+	status = -EOPNOTSUPP;
     }
-    tmp.lval[j>>2] = (s32)lp->tx_ring[i].buf; j+=4;
-      
-    for (i=0;i<lp->rxRingSize;i++){
-      tmp.lval[j>>2] = lp->rx_ring[i].status; j+=4;
-    }
-    for (i=0;i<lp->txRingSize;i++){
-      tmp.lval[j>>2] = lp->tx_ring[i].status; j+=4;
-    }
-
-    tmp.lval[j>>2] = inl(DE4X5_STS); j+=4;
-    tmp.lval[j>>2] = inl(DE4X5_BMR); j+=4;
-    tmp.lval[j>>2] = inl(DE4X5_IMR); j+=4;
-    tmp.lval[j>>2] = inl(DE4X5_OMR); j+=4;
-    tmp.lval[j>>2] = inl(DE4X5_SISR); j+=4;
-    tmp.lval[j>>2] = inl(DE4X5_SICR); j+=4;
-    tmp.lval[j>>2] = inl(DE4X5_STRR); j+=4;
-    tmp.lval[j>>2] = inl(DE4X5_SIGR); j+=4; 
-    
-    tmp.addr[j++] = lp->txRingSize;
-    tmp.addr[j++] = dev->tbusy;
-      
-    ioc->len = j;
-    if (!(status = verify_area(VERIFY_WRITE, (void *)ioc->data, ioc->len))) {
-      memcpy_tofs(ioc->data, tmp.addr, ioc->len);
-    }
-
-    break;
-  default:
-    status = -EOPNOTSUPP;
-  }
-
-  return status;
+    
+    return status;
 }
 
 #ifdef MODULE
+/*
+** Note now that module autoprobing is allowed under EISA and PCI. The
+** IRQ lines will not be auto-detected; instead I'll rely on the BIOSes
+** to "do the right thing".
+**
+** NB: Current register_netdevice() code does not permit assigning io=0 as
+** this driver will autoprobe all instances of acceptable DECchips. The
+** cleanup_module() code needs work still....(just to unload modules owned
+** by this driver).
+*/
 static char devicename[9] = { 0, };
 static struct device thisDE4X5 = {
-  devicename, /* device name is inserted by linux/drivers/net/net_init.c */
-  0, 0, 0, 0,
-  0x2000, 10, /* I/O address, IRQ */
-  0, 0, 0, NULL, de4x5_probe };
-	
-static int io=0x000b;	/* EDIT THESE LINES FOR YOUR CONFIGURATION */
-static int irq=10;	/* or use the insmod io= irq= options 		*/
+    devicename,   /* device name inserted by /linux/drivers/net/net_init.c  */
+    0, 0, 0, 0,
+    0, 0,         /* I/O address, IRQ                                       */
+    0, 0, 0, NULL, de4x5_probe };
+
+static int io=0x0b; /* EDIT THESE LINES FOR YOUR CONFIGURATION              */
 
 int
 init_module(void)
 {
-  thisDE4X5.base_addr=io;
-  thisDE4X5.irq=irq;
-  if (register_netdev(&thisDE4X5) != 0)
-    return -EIO;
-  return 0;
+    struct device *p  = (struct device *)&thisDE4X5;
+    
+    thisDE4X5.base_addr = io;                   /* Now autoprobe the module */
+    thisDE4X5.irq = 0;
+    
+    for (; p!=NULL; p=p->next) {
+	if (register_netdev(p) != 0)
+	  return -EIO;
+    }
+    io=0;
+    return 0;
 }
 
 void
 cleanup_module(void)
 {
-  struct de4x5_private *lp = (struct de4x5_private *) thisDE4X5.priv;
+    struct de4x5_private *lp = (struct de4x5_private *) thisDE4X5.priv;
+    struct device *p  = (struct device *)&thisDE4X5;
+    int keep_loaded = 0;
+    
+    for (; p!=NULL; p=p->next) {
+	keep_loaded += (p->flags & IFF_UP);     /* Is an interface up?       */
+    }
+    
+    if (keep_loaded) {
+	printk("de4x5: Cannot unload modules - %d interface%s%s still active.\n",
+	       keep_loaded, (keep_loaded>1 ? "s ": " "),
+	       (keep_loaded>1 ? "are": "is"));
+	return;
+    }
+    
+    for (p=thisDE4X5.next; p!=NULL; p=p->next) {
+	if (p->priv) {                          /* Private area allocated?   */
+	    struct de4x5_private *lp = (struct de4x5_private *)p->priv;
+	    if (lp->cache.buf) {                /* MAC buffers allocated?    */
+		kfree(lp->cache.buf);           /* Free the MAC buffers      */
+	    }
+	    release_region(p->base_addr, (lp->bus == PCI ? 
+					  DE4X5_PCI_TOTAL_SIZE :
+					  DE4X5_EISA_TOTAL_SIZE));
+	    kfree(lp->cache.priv);              /* Free the private area     */
+	}
+	unregister_netdev(p);
+	kfree(p);                               /* Free the device structure */
+    }
+
+    if (thisDE4X5.priv) {
+	if (lp->cache.buf) {                    /* Are MAC buffers allocated */
+            kfree(lp->cache.buf);
+	}
+	release_region(thisDE4X5.base_addr,
+		      (lp->bus == PCI ? 
+		       DE4X5_PCI_TOTAL_SIZE :
+		       DE4X5_EISA_TOTAL_SIZE));
+	kfree(lp->cache.priv);
+	thisDE4X5.priv = NULL;
+    }
+    unregister_netdev(&thisDE4X5);
 
-  if (lp) {
-    kfree_s(bus_to_virt(lp->rx_ring[0].buf), RX_BUFF_SZ * NUM_RX_DESC + ALIGN);
-  }
-  kfree_s(thisDE4X5.priv, sizeof(struct de4x5_private) + ALIGN);
-  thisDE4X5.priv = NULL;
-
-  release_region(thisDE4X5.base_addr, (lp->bus == PCI ? 
-					             DE4X5_PCI_TOTAL_SIZE :
-			                             DE4X5_EISA_TOTAL_SIZE));
-  unregister_netdev(&thisDE4X5);
+    return;
 }
 #endif /* MODULE */
 
 
 /*
  * Local variables:
- *  kernel-compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O2 -m486 -c de4x5.c"
+ *  compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O2 -m486 -c de4x5.c"
  *
- *  module-compile-command: "gcc -D__KERNEL__ -DMODULE -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O2 -m486 -c de4x5.c"
+ *  compile-command: "gcc -D__KERNEL__ -DMODULE -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O2 -m486 -c de4x5.c"
  * End:
  */
-
-

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this