1 files changed, 294 insertions, 378 deletions
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 62133cee446a..f80640f5a744 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 1997-2000 LAN Media Corporation (LMC)
  * All rights reserved.  www.lanmedia.com
+  * Generic HDLC port Copyright (C) 2008 Krzysztof Halasa <khc@pm.waw.pl>
  *
  * This code is written by:
  * Andrew Stanley-Jones (asj@cban.com)
@@ -36,8 +37,6 @@
  *
  */
-/* $Id: lmc_main.c,v 1.36 2000/04/11 05:25:25 asj Exp $ */
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/string.h>
@@ -49,6 +48,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/hdlc.h>
 #include <linux/init.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
@@ -57,9 +57,6 @@
 #include <linux/skbuff.h>
 #include <linux/inet.h>
 #include <linux/bitops.h>
-#include <net/syncppp.h>
 #include <asm/processor.h>             /* Processor type for cache alignment. */
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -78,8 +75,6 @@
 #include "lmc_debug.h"
 #include "lmc_proto.h"
-static int lmc_first_load = 0;
 static int LMC_PKT_BUF_SZ = 1542;
 static struct pci_device_id lmc_pci_tbl[] = {
@@ -91,11 +86,10 @@ static struct pci_device_id lmc_pci_tbl[] = {
 };
 MODULE_DEVICE_TABLE(pci, lmc_pci_tbl);
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static int lmc_rx (struct net_device *dev);
 static int lmc_open(struct net_device *dev);
 static int lmc_close(struct net_device *dev);
@@ -114,20 +108,14 @@ static void lmc_driver_timeout(struct net_device *dev);
 * linux reserves 16 device specific IOCTLs.  We call them
 * LMCIOC* to control various bits of our world.
 */
-int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
+int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
 {
-    lmc_softc_t *sc;
+    lmc_softc_t *sc = dev_to_sc(dev);
    lmc_ctl_t ctl;
-    int ret;
+    int ret = -EOPNOTSUPP;
-    u_int16_t regVal;
+    u16 regVal;
    unsigned long flags;
-    struct sppp *sp;
-    ret = -EOPNOTSUPP;
-    sc = dev->priv;
    lmc_trace(dev, "lmc_ioctl in");
    /*
@@ -149,7 +137,6 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
        break;
    case LMCIOCSINFO: /*fold01*/
-        sp = &((struct ppp_device *) dev)->sppp;
        if (!capable(CAP_NET_ADMIN)) {
            ret = -EPERM;
            break;
@@ -175,25 +162,20 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                sc->TxDescriptControlInit &= ~LMC_TDES_ADD_CRC_DISABLE;
        }
-        if (ctl.keepalive_onoff == LMC_CTL_OFF)
-            sp->pp_flags &= ~PP_KEEPALIVE;      /* Turn off */
-        else
-            sp->pp_flags |= PP_KEEPALIVE;       /* Turn on */
        ret = 0;
        break;
    case LMCIOCIFTYPE: /*fold01*/
        {
-            u_int16_t   old_type = sc->if_type;
+            u16 old_type = sc->if_type;
-            u_int16_t   new_type;
+            u16 new_type;
            if (!capable(CAP_NET_ADMIN)) {
                ret = -EPERM;
                break;
            }
-            if (copy_from_user(&new_type, ifr->ifr_data, sizeof(u_int16_t))) {
+            if (copy_from_user(&new_type, ifr->ifr_data, sizeof(u16))) {
                ret = -EFAULT;
                break;
            }
@@ -206,15 +188,11 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
            }
            
            lmc_proto_close(sc);
-            lmc_proto_detach(sc);
            sc->if_type = new_type;
-//            lmc_proto_init(sc);
            lmc_proto_attach(sc);
-            lmc_proto_open(sc);
+            ret = lmc_proto_open(sc);
+            break;
-            ret = 0 ;
-            break ;
        }
    case LMCIOCGETXINFO: /*fold01*/
@@ -241,51 +219,53 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
        break;
-    case LMCIOCGETLMCSTATS: /*fold01*/
+    case LMCIOCGETLMCSTATS:
-        if (sc->lmc_cardtype == LMC_CARDTYPE_T1){
+            if (sc->lmc_cardtype == LMC_CARDTYPE_T1) {
-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_FERR_LSB);
+                    lmc_mii_writereg(sc, 0, 17, T1FRAMER_FERR_LSB);
-            sc->stats.framingBitErrorCount +=
+                    sc->extra_stats.framingBitErrorCount +=
-                lmc_mii_readreg (sc, 0, 18) & 0xff;
+                            lmc_mii_readreg(sc, 0, 18) & 0xff;
-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_FERR_MSB);
+                    lmc_mii_writereg(sc, 0, 17, T1FRAMER_FERR_MSB);
-            sc->stats.framingBitErrorCount +=
+                    sc->extra_stats.framingBitErrorCount +=
-                (lmc_mii_readreg (sc, 0, 18) & 0xff) << 8;
+                            (lmc_mii_readreg(sc, 0, 18) & 0xff) << 8;
-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_LCV_LSB);
+                    lmc_mii_writereg(sc, 0, 17, T1FRAMER_LCV_LSB);
-            sc->stats.lineCodeViolationCount +=
+                    sc->extra_stats.lineCodeViolationCount +=
-                lmc_mii_readreg (sc, 0, 18) & 0xff;
+                            lmc_mii_readreg(sc, 0, 18) & 0xff;
-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_LCV_MSB);
+                    lmc_mii_writereg(sc, 0, 17, T1FRAMER_LCV_MSB);
-            sc->stats.lineCodeViolationCount +=
+                    sc->extra_stats.lineCodeViolationCount +=
-                (lmc_mii_readreg (sc, 0, 18) & 0xff) << 8;
+                            (lmc_mii_readreg(sc, 0, 18) & 0xff) << 8;
-            lmc_mii_writereg (sc, 0, 17, T1FRAMER_AERR);
+                    lmc_mii_writereg(sc, 0, 17, T1FRAMER_AERR);
-            regVal = lmc_mii_readreg (sc, 0, 18) & 0xff;
+                    regVal = lmc_mii_readreg(sc, 0, 18) & 0xff;
-            sc->stats.lossOfFrameCount +=
+                    sc->extra_stats.lossOfFrameCount +=
-                (regVal & T1FRAMER_LOF_MASK) >> 4;
+                            (regVal & T1FRAMER_LOF_MASK) >> 4;
-            sc->stats.changeOfFrameAlignmentCount +=
+                    sc->extra_stats.changeOfFrameAlignmentCount +=
-                (regVal & T1FRAMER_COFA_MASK) >> 2;
+                            (regVal & T1FRAMER_COFA_MASK) >> 2;
-            sc->stats.severelyErroredFrameCount +=
+                    sc->extra_stats.severelyErroredFrameCount +=
-                regVal & T1FRAMER_SEF_MASK;
+                            regVal & T1FRAMER_SEF_MASK;
-        }
+            }
+            if (copy_to_user(ifr->ifr_data, &sc->lmc_device->stats,
-        if (copy_to_user(ifr->ifr_data, &sc->stats,
+                             sizeof(sc->lmc_device->stats)) ||
-                         sizeof (struct lmc_statistics)))
+                copy_to_user(ifr->ifr_data + sizeof(sc->lmc_device->stats),
-                ret = -EFAULT;
+                             &sc->extra_stats, sizeof(sc->extra_stats)))
-        else
+                    ret = -EFAULT;
-                ret = 0;
+            else
-        break;
+                    ret = 0;
+            break;
-    case LMCIOCCLEARLMCSTATS: /*fold01*/
+    case LMCIOCCLEARLMCSTATS:
-        if (!capable(CAP_NET_ADMIN)){
+            if (!capable(CAP_NET_ADMIN)) {
-            ret = -EPERM;
+                    ret = -EPERM;
-            break;
+                    break;
-        }
+            }
-        memset (&sc->stats, 0, sizeof (struct lmc_statistics));
+            memset(&sc->lmc_device->stats, 0, sizeof(sc->lmc_device->stats));
-        sc->stats.check = STATCHECK;
+            memset(&sc->extra_stats, 0, sizeof(sc->extra_stats));
-        sc->stats.version_size = (DRIVER_VERSION << 16) +
+            sc->extra_stats.check = STATCHECK;
-            sizeof (struct lmc_statistics);
+            sc->extra_stats.version_size = (DRIVER_VERSION << 16) +
-        sc->stats.lmc_cardtype = sc->lmc_cardtype;
+                    sizeof(sc->lmc_device->stats) + sizeof(sc->extra_stats);
-        ret = 0;
+            sc->extra_stats.lmc_cardtype = sc->lmc_cardtype;
-        break;
+            ret = 0;
+            break;
    case LMCIOCSETCIRCUIT: /*fold01*/
        if (!capable(CAP_NET_ADMIN)){
@@ -330,7 +310,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
                ret = -EFAULT;
                break;
        }
-        if (copy_to_user(ifr->ifr_data + sizeof (u32), lmcEventLogBuf, sizeof (lmcEventLogBuf)))
+        if (copy_to_user(ifr->ifr_data + sizeof(u32), lmcEventLogBuf,
+                         sizeof(lmcEventLogBuf)))
                ret = -EFAULT;
        else
                ret = 0;
@@ -641,14 +622,12 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
 /* the watchdog process that cruises around */
 static void lmc_watchdog (unsigned long data) /*fold00*/
 {
-    struct net_device *dev = (struct net_device *) data;
+    struct net_device *dev = (struct net_device *)data;
-    lmc_softc_t *sc;
+    lmc_softc_t *sc = dev_to_sc(dev);
    int link_status;
-    u_int32_t ticks;
+    u32 ticks;
    unsigned long flags;
-    sc = dev->priv;
    lmc_trace(dev, "lmc_watchdog in");
    spin_lock_irqsave(&sc->lmc_lock, flags);
@@ -677,22 +656,22 @@ static void lmc_watchdog (unsigned long data) /*fold00*/
     * check for a transmit interrupt timeout
     * Has the packet xmt vs xmt serviced threshold been exceeded */
    if (sc->lmc_taint_tx == sc->lastlmc_taint_tx &&
-        sc->stats.tx_packets > sc->lasttx_packets &&
+        sc->lmc_device->stats.tx_packets > sc->lasttx_packets &&
-        sc->tx_TimeoutInd == 0)
+        sc->tx_TimeoutInd == 0)
    {
        /* wait for the watchdog to come around again */
        sc->tx_TimeoutInd = 1;
    }
    else if (sc->lmc_taint_tx == sc->lastlmc_taint_tx &&
-             sc->stats.tx_packets > sc->lasttx_packets &&
+             sc->lmc_device->stats.tx_packets > sc->lasttx_packets &&
-             sc->tx_TimeoutInd)
+             sc->tx_TimeoutInd)
    {
        LMC_EVENT_LOG(LMC_EVENT_XMTINTTMO, LMC_CSR_READ (sc, csr_status), 0);
        sc->tx_TimeoutDisplay = 1;
-        sc->stats.tx_TimeoutCnt++;
+        sc->extra_stats.tx_TimeoutCnt++;
        /* DEC chip is stuck, hit it with a RESET!!!! */
        lmc_running_reset (dev);
@@ -712,13 +691,11 @@ static void lmc_watchdog (unsigned long data) /*fold00*/
        /* reset the transmit timeout detection flag */
        sc->tx_TimeoutInd = 0;
        sc->lastlmc_taint_tx = sc->lmc_taint_tx;
-        sc->lasttx_packets = sc->stats.tx_packets;
+        sc->lasttx_packets = sc->lmc_device->stats.tx_packets;
-    }
+    } else {
-    else
-    {
        sc->tx_TimeoutInd = 0;
        sc->lastlmc_taint_tx = sc->lmc_taint_tx;
-        sc->lasttx_packets = sc->stats.tx_packets;
+        sc->lasttx_packets = sc->lmc_device->stats.tx_packets;
    }
    /* --- end time out check ----------------------------------- */
@@ -748,19 +725,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/
         sc->last_link_status = 1;
         /* lmc_reset (sc); Again why reset??? */
-         /* Inform the world that link protocol is back up. */
         netif_carrier_on(dev);
-         /* Now we have to tell the syncppp that we had an outage
-          * and that it should deal.  Calling sppp_reopen here
-          * should do the trick, but we may have to call sppp_close
-          * when the link goes down, and call sppp_open here.
-          * Subject to more testing.
-          * --bbraun
-          */
-         lmc_proto_reopen(sc);
     }
    /* Call media specific watchdog functions */
@@ -816,114 +781,93 @@ kick_timer:
 }
-static void lmc_setup(struct net_device * const dev) /*fold00*/
+static int lmc_attach(struct net_device *dev, unsigned short encoding,
+                      unsigned short parity)
 {
-    lmc_trace(dev, "lmc_setup in");
+        if (encoding == ENCODING_NRZ && parity == PARITY_CRC16_PR1_CCITT)
+                return 0;
-    dev->type = ARPHRD_HDLC;
+        return -EINVAL;
-    dev->hard_start_xmit = lmc_start_xmit;
-    dev->open = lmc_open;
-    dev->stop = lmc_close;
-    dev->get_stats = lmc_get_stats;
-    dev->do_ioctl = lmc_ioctl;
-    dev->tx_timeout = lmc_driver_timeout;
-    dev->watchdog_timeo = (HZ); /* 1 second */
-    
-    lmc_trace(dev, "lmc_setup out");
 }
 static int __devinit lmc_init_one(struct pci_dev *pdev,
                                  const struct pci_device_id *ent)
 {
-    struct net_device *dev;
+        lmc_softc_t *sc;
-    lmc_softc_t *sc;
+        struct net_device *dev;
-    u16 subdevice;
+        u16 subdevice;
-    u_int16_t AdapModelNum;
+        u16 AdapModelNum;
-    int err = -ENOMEM;
+        int err;
-    static int cards_found;
+        static int cards_found;
-#ifndef GCOM
-    /* We name by type not by vendor */
+        /* lmc_trace(dev, "lmc_init_one in"); */
-    static const char lmcname[] = "hdlc%d";
-#else
+        err = pci_enable_device(pdev);
-    /* 
+        if (err) {
-     * GCOM uses LMC vendor name so that clients can know which card
+                printk(KERN_ERR "lmc: pci enable failed: %d\n", err);
-     * to attach to.
+                return err;
-     */
+        }
-    static const char lmcname[] = "lmc%d";
-#endif
-    /*
-     * Allocate our own device structure
-     */
-    dev = alloc_netdev(sizeof(lmc_softc_t), lmcname, lmc_setup);
-    if (!dev) {
-        printk (KERN_ERR "lmc:alloc_netdev for device failed\n");
-        goto out1;
-    }
- 
-    lmc_trace(dev, "lmc_init_one in");
-    err = pci_enable_device(pdev);
-    if (err) {
-            printk(KERN_ERR "lmc: pci enable failed:%d\n", err);
-            goto out2;
-    }
-    
-    if (pci_request_regions(pdev, "lmc")) {
-            printk(KERN_ERR "lmc: pci_request_region failed\n");
-            err = -EIO;
-            goto out3;
-    }
-    pci_set_drvdata(pdev, dev);
-    if(lmc_first_load == 0){
-        printk(KERN_INFO "Lan Media Corporation WAN Driver Version %d.%d.%d\n",
-               DRIVER_MAJOR_VERSION, DRIVER_MINOR_VERSION,DRIVER_SUB_VERSION);
-        lmc_first_load = 1;
-    }
-    
-    sc = dev->priv;
-    sc->lmc_device = dev;
-    sc->name = dev->name;
-    /* Initialize the sppp layer */
-    /* An ioctl can cause a subsequent detach for raw frame interface */
-    dev->ml_priv = sc;
-    sc->if_type = LMC_PPP;
-    sc->check = 0xBEAFCAFE;
-    dev->base_addr = pci_resource_start(pdev, 0);
-    dev->irq = pdev->irq;
-    SET_NETDEV_DEV(dev, &pdev->dev);
-    /*
-     * This will get the protocol layer ready and do any 1 time init's
-     * Must have a valid sc and dev structure
-     */
-    lmc_proto_init(sc);
-    lmc_proto_attach(sc);
-    /*
+        err = pci_request_regions(pdev, "lmc");
-     * Why were we changing this???
+        if (err) {
-     dev->tx_queue_len = 100;
+                printk(KERN_ERR "lmc: pci_request_region failed\n");
-     */
+                goto err_req_io;
+        }
-    /* Init the spin lock so can call it latter */
+        /*
+         * Allocate our own device structure
+         */
+        sc = kzalloc(sizeof(lmc_softc_t), GFP_KERNEL);
+        if (!sc) {
+                err = -ENOMEM;
+                goto err_kzalloc;
+        }
-    spin_lock_init(&sc->lmc_lock);
+        dev = alloc_hdlcdev(sc);
-    pci_set_master(pdev);
+        if (!dev) {
+                printk(KERN_ERR "lmc:alloc_netdev for device failed\n");
+                goto err_hdlcdev;
+        }
-    printk ("%s: detected at %lx, irq %d\n", dev->name,
-            dev->base_addr, dev->irq);
-    if (register_netdev (dev) != 0) {
+        dev->type = ARPHRD_HDLC;
-        printk (KERN_ERR "%s: register_netdev failed.\n", dev->name);
+        dev_to_hdlc(dev)->xmit = lmc_start_xmit;
-        goto out4;
+        dev_to_hdlc(dev)->attach = lmc_attach;
-    }
+        dev->open = lmc_open;
+        dev->stop = lmc_close;
+        dev->get_stats = lmc_get_stats;
+        dev->do_ioctl = lmc_ioctl;
+        dev->tx_timeout = lmc_driver_timeout;
+        dev->watchdog_timeo = HZ; /* 1 second */
+        dev->tx_queue_len = 100;
+        sc->lmc_device = dev;
+        sc->name = dev->name;
+        sc->if_type = LMC_PPP;
+        sc->check = 0xBEAFCAFE;
+        dev->base_addr = pci_resource_start(pdev, 0);
+        dev->irq = pdev->irq;
+        pci_set_drvdata(pdev, dev);
+        SET_NETDEV_DEV(dev, &pdev->dev);
+        /*
+         * This will get the protocol layer ready and do any 1 time init's
+         * Must have a valid sc and dev structure
+         */
+        lmc_proto_attach(sc);
+        /* Init the spin lock so can call it latter */
+        spin_lock_init(&sc->lmc_lock);
+        pci_set_master(pdev);
+        printk(KERN_INFO "%s: detected at %lx, irq %d\n", dev->name,
+               dev->base_addr, dev->irq);
+        err = register_hdlc_device(dev);
+        if (err) {
+                printk(KERN_ERR "%s: register_netdev failed.\n", dev->name);
+                free_netdev(dev);
+                goto err_hdlcdev;
+        }
    sc->lmc_cardtype = LMC_CARDTYPE_UNKNOWN;
    sc->lmc_timing = LMC_CTL_CLOCK_SOURCE_EXT;
@@ -939,27 +883,27 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
    switch (subdevice) {
    case PCI_DEVICE_ID_LMC_HSSI:
-        printk ("%s: LMC HSSI\n", dev->name);
+        printk(KERN_INFO "%s: LMC HSSI\n", dev->name);
        sc->lmc_cardtype = LMC_CARDTYPE_HSSI;
        sc->lmc_media = &lmc_hssi_media;
        break;
    case PCI_DEVICE_ID_LMC_DS3:
-        printk ("%s: LMC DS3\n", dev->name);
+        printk(KERN_INFO "%s: LMC DS3\n", dev->name);
        sc->lmc_cardtype = LMC_CARDTYPE_DS3;
        sc->lmc_media = &lmc_ds3_media;
        break;
    case PCI_DEVICE_ID_LMC_SSI:
-        printk ("%s: LMC SSI\n", dev->name);
+        printk(KERN_INFO "%s: LMC SSI\n", dev->name);
        sc->lmc_cardtype = LMC_CARDTYPE_SSI;
        sc->lmc_media = &lmc_ssi_media;
        break;
    case PCI_DEVICE_ID_LMC_T1:
-        printk ("%s: LMC T1\n", dev->name);
+        printk(KERN_INFO "%s: LMC T1\n", dev->name);
        sc->lmc_cardtype = LMC_CARDTYPE_T1;
        sc->lmc_media = &lmc_t1_media;
        break;
    default:
-        printk (KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev->name);
+        printk(KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev->name);
        break;
    }
@@ -977,32 +921,28 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
     */
    AdapModelNum = (lmc_mii_readreg (sc, 0, 3) & 0x3f0) >> 4;
-    if ((AdapModelNum == LMC_ADAP_T1
+    if ((AdapModelNum != LMC_ADAP_T1 || /* detect LMC1200 */
-         && subdevice == PCI_DEVICE_ID_LMC_T1) ||       /* detect LMC1200 */
+         subdevice != PCI_DEVICE_ID_LMC_T1) &&
-        (AdapModelNum == LMC_ADAP_SSI
+        (AdapModelNum != LMC_ADAP_SSI || /* detect LMC1000 */
-         && subdevice == PCI_DEVICE_ID_LMC_SSI) ||      /* detect LMC1000 */
+         subdevice != PCI_DEVICE_ID_LMC_SSI) &&
-        (AdapModelNum == LMC_ADAP_DS3
+        (AdapModelNum != LMC_ADAP_DS3 || /* detect LMC5245 */
-         && subdevice == PCI_DEVICE_ID_LMC_DS3) ||      /* detect LMC5245 */
+         subdevice != PCI_DEVICE_ID_LMC_DS3) &&
-        (AdapModelNum == LMC_ADAP_HSSI
+        (AdapModelNum != LMC_ADAP_HSSI || /* detect LMC5200 */
-         && subdevice == PCI_DEVICE_ID_LMC_HSSI))
+         subdevice != PCI_DEVICE_ID_LMC_HSSI))
-    {                           /* detect LMC5200 */
+            printk(KERN_WARNING "%s: Model number (%d) miscompare for PCI"
+                   " Subsystem ID = 0x%04x\n",
+                   dev->name, AdapModelNum, subdevice);
-    }
-    else {
-        printk ("%s: Model number (%d) miscompare for PCI Subsystem ID = 0x%04x\n",
-                dev->name, AdapModelNum, subdevice);
-//        return (NULL);
-    }
    /*
     * reset clock
     */
    LMC_CSR_WRITE (sc, csr_gp_timer, 0xFFFFFFFFUL);
    sc->board_idx = cards_found++;
-    sc->stats.check = STATCHECK;
+    sc->extra_stats.check = STATCHECK;
-    sc->stats.version_size = (DRIVER_VERSION << 16) +
+    sc->extra_stats.version_size = (DRIVER_VERSION << 16) +
-        sizeof (struct lmc_statistics);
+            sizeof(sc->lmc_device->stats) + sizeof(sc->extra_stats);
-    sc->stats.lmc_cardtype = sc->lmc_cardtype;
+    sc->extra_stats.lmc_cardtype = sc->lmc_cardtype;
    sc->lmc_ok = 0;
    sc->last_link_status = 0;
@@ -1010,58 +950,51 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
    lmc_trace(dev, "lmc_init_one out");
    return 0;
- out4:
+err_hdlcdev:
-    lmc_proto_detach(sc);
+        pci_set_drvdata(pdev, NULL);
- out3:
+        kfree(sc);
-    if (pdev) {
+err_kzalloc:
-            pci_release_regions(pdev);
+        pci_release_regions(pdev);
-            pci_set_drvdata(pdev, NULL);
+err_req_io:
-    }
+        pci_disable_device(pdev);
- out2:
+        return err;
-    free_netdev(dev);
- out1:
-    return err;
 }
 /*
 * Called from pci when removing module.
 */
-static void __devexit lmc_remove_one (struct pci_dev *pdev)
+static void __devexit lmc_remove_one(struct pci_dev *pdev)
 {
-    struct net_device *dev = pci_get_drvdata(pdev);
+        struct net_device *dev = pci_get_drvdata(pdev);
-    
-    if (dev) {
+        if (dev) {
-            lmc_softc_t *sc = dev->priv;
+                printk(KERN_DEBUG "%s: removing...\n", dev->name);
-            
+                unregister_hdlc_device(dev);
-            printk("%s: removing...\n", dev->name);
+                free_netdev(dev);
-            lmc_proto_detach(sc);
+                pci_release_regions(pdev);
-            unregister_netdev(dev);
+                pci_disable_device(pdev);
-            free_netdev(dev);
+                pci_set_drvdata(pdev, NULL);
-            pci_release_regions(pdev);
+        }
-            pci_disable_device(pdev);
-            pci_set_drvdata(pdev, NULL);
-    }
 }
 /* After this is called, packets can be sent.
 * Does not initialize the addresses
 */
-static int lmc_open (struct net_device *dev) /*fold00*/
+static int lmc_open(struct net_device *dev)
 {
-    lmc_softc_t *sc = dev->priv;
+    lmc_softc_t *sc = dev_to_sc(dev);
+    int err;
    lmc_trace(dev, "lmc_open in");
    lmc_led_on(sc, LMC_DS3_LED0);
-    lmc_dec_reset (sc);
+    lmc_dec_reset(sc);
-    lmc_reset (sc);
+    lmc_reset(sc);
-    LMC_EVENT_LOG(LMC_EVENT_RESET1, LMC_CSR_READ (sc, csr_status), 0);
-    LMC_EVENT_LOG(LMC_EVENT_RESET2,
-                  lmc_mii_readreg (sc, 0, 16),
-                  lmc_mii_readreg (sc, 0, 17));
+    LMC_EVENT_LOG(LMC_EVENT_RESET1, LMC_CSR_READ(sc, csr_status), 0);
+    LMC_EVENT_LOG(LMC_EVENT_RESET2, lmc_mii_readreg(sc, 0, 16),
+                  lmc_mii_readreg(sc, 0, 17));
    if (sc->lmc_ok){
        lmc_trace(dev, "lmc_open lmc_ok out");
@@ -1106,14 +1039,14 @@ static int lmc_open (struct net_device *dev) /*fold00*/
    /* dev->flags |= IFF_UP; */
-    lmc_proto_open(sc);
+    if ((err = lmc_proto_open(sc)) != 0)
+            return err;
    dev->do_ioctl = lmc_ioctl;
    netif_start_queue(dev);
-    
+    sc->extra_stats.tx_tbusy0++;
-    sc->stats.tx_tbusy0++ ;
    /*
     * select what interrupts we want to get
@@ -1165,8 +1098,7 @@ static int lmc_open (struct net_device *dev) /*fold00*/
 static void lmc_running_reset (struct net_device *dev) /*fold00*/
 {
+    lmc_softc_t *sc = dev_to_sc(dev);
-    lmc_softc_t *sc = (lmc_softc_t *) dev->priv;
    lmc_trace(dev, "lmc_runnig_reset in");
@@ -1184,7 +1116,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/
    netif_wake_queue(dev);
    sc->lmc_txfull = 0;
-    sc->stats.tx_tbusy0++ ;
+    sc->extra_stats.tx_tbusy0++;
    sc->lmc_intrmask = TULIP_DEFAULT_INTR_MASK;
    LMC_CSR_WRITE (sc, csr_intr, sc->lmc_intrmask);
@@ -1200,14 +1132,13 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/
 * This disables the timer for the watchdog and keepalives,
 * and disables the irq for dev.
 */
-static int lmc_close (struct net_device *dev) /*fold00*/
+static int lmc_close(struct net_device *dev)
 {
    /* not calling release_region() as we should */
-    lmc_softc_t *sc;
+    lmc_softc_t *sc = dev_to_sc(dev);
    lmc_trace(dev, "lmc_close in");
-    
-    sc = dev->priv;
    sc->lmc_ok = 0;
    sc->lmc_media->set_link_status (sc, 0);
    del_timer (&sc->timer);
@@ -1215,7 +1146,7 @@ static int lmc_close (struct net_device *dev) /*fold00*/
    lmc_ifdown (dev);
    lmc_trace(dev, "lmc_close out");
-    
    return 0;
 }
@@ -1223,16 +1154,16 @@ static int lmc_close (struct net_device *dev) /*fold00*/
 /* When the interface goes down, this is called */
 static int lmc_ifdown (struct net_device *dev) /*fold00*/
 {
-    lmc_softc_t *sc = dev->priv;
+    lmc_softc_t *sc = dev_to_sc(dev);
    u32 csr6;
    int i;
    lmc_trace(dev, "lmc_ifdown in");
-    
    /* Don't let anything else go on right now */
    //    dev->start = 0;
    netif_stop_queue(dev);
-    sc->stats.tx_tbusy1++ ;
+    sc->extra_stats.tx_tbusy1++;
    /* stop interrupts */
    /* Clear the interrupt mask */
@@ -1244,8 +1175,8 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/
    csr6 &= ~LMC_DEC_SR;                /* Turn off the Receive bit */
    LMC_CSR_WRITE (sc, csr_command, csr6);
-    sc->stats.rx_missed_errors +=
+    sc->lmc_device->stats.rx_missed_errors +=
-        LMC_CSR_READ (sc, csr_missed_frames) & 0xffff;
+            LMC_CSR_READ(sc, csr_missed_frames) & 0xffff;
    /* release the interrupt */
    if(sc->got_irq == 1){
@@ -1276,7 +1207,7 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/
    lmc_led_off (sc, LMC_MII16_LED_ALL);
    netif_wake_queue(dev);
-    sc->stats.tx_tbusy0++ ;
+    sc->extra_stats.tx_tbusy0++;
    lmc_trace(dev, "lmc_ifdown out");
@@ -1289,7 +1220,7 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/
 static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/
 {
    struct net_device *dev = (struct net_device *) dev_instance;
-    lmc_softc_t *sc;
+    lmc_softc_t *sc = dev_to_sc(dev);
    u32 csr;
    int i;
    s32 stat;
@@ -1300,8 +1231,6 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/
    lmc_trace(dev, "lmc_interrupt in");
-    sc = dev->priv;
-    
    spin_lock(&sc->lmc_lock);
    /*
@@ -1354,7 +1283,7 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/
            int         n_compl = 0 ;
            /* reset the transmit timeout detection flag -baz */
-            sc->stats.tx_NoCompleteCnt = 0;
+            sc->extra_stats.tx_NoCompleteCnt = 0;
            badtx = sc->lmc_taint_tx;
            i = badtx % LMC_TXDESCS;
@@ -1378,27 +1307,25 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/
                if (sc->lmc_txq[i] == NULL)
                    continue;
-                /*
+                /*
-                 * Check the total error summary to look for any errors
+                 * Check the total error summary to look for any errors
-                 */
+                 */
-                if (stat & 0x8000) {
+                if (stat & 0x8000) {
-                    sc->stats.tx_errors++;
+                        sc->lmc_device->stats.tx_errors++;
-                    if (stat & 0x4104)
+                        if (stat & 0x4104)
-                        sc->stats.tx_aborted_errors++;
+                                sc->lmc_device->stats.tx_aborted_errors++;
-                    if (stat & 0x0C00)
+                        if (stat & 0x0C00)
-                        sc->stats.tx_carrier_errors++;
+                                sc->lmc_device->stats.tx_carrier_errors++;
-                    if (stat & 0x0200)
+                        if (stat & 0x0200)
-                        sc->stats.tx_window_errors++;
+                                sc->lmc_device->stats.tx_window_errors++;
-                    if (stat & 0x0002)
+                        if (stat & 0x0002)
-                        sc->stats.tx_fifo_errors++;
+                                sc->lmc_device->stats.tx_fifo_errors++;
-                }
+                } else {
-                else {
+                        sc->lmc_device->stats.tx_bytes += sc->lmc_txring[i].length & 0x7ff;
-                    
-                    sc->stats.tx_bytes += sc->lmc_txring[i].length & 0x7ff;
+                        sc->lmc_device->stats.tx_packets++;
-                    
-                    sc->stats.tx_packets++;
                }
-                
                //                dev_kfree_skb(sc->lmc_txq[i]);
                dev_kfree_skb_irq(sc->lmc_txq[i]);
                sc->lmc_txq[i] = NULL;
@@ -1415,13 +1342,13 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/
            LMC_EVENT_LOG(LMC_EVENT_TBUSY0, n_compl, 0);
            sc->lmc_txfull = 0;
            netif_wake_queue(dev);
-            sc->stats.tx_tbusy0++ ;
+            sc->extra_stats.tx_tbusy0++;
 #ifdef DEBUG
-            sc->stats.dirtyTx = badtx;
+            sc->extra_stats.dirtyTx = badtx;
-            sc->stats.lmc_next_tx = sc->lmc_next_tx;
+            sc->extra_stats.lmc_next_tx = sc->lmc_next_tx;
-            sc->stats.lmc_txfull = sc->lmc_txfull;
+            sc->extra_stats.lmc_txfull = sc->lmc_txfull;
 #endif
            sc->lmc_taint_tx = badtx;
@@ -1476,9 +1403,9 @@ lmc_int_fail_out:
    return IRQ_RETVAL(handled);
 }
-static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00*/
+static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-    lmc_softc_t *sc;
+    lmc_softc_t *sc = dev_to_sc(dev);
    u32 flag;
    int entry;
    int ret = 0;
@@ -1486,8 +1413,6 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
    lmc_trace(dev, "lmc_start_xmit in");
-    sc = dev->priv;
    spin_lock_irqsave(&sc->lmc_lock, flags);
    /* normal path, tbusy known to be zero */
@@ -1532,8 +1457,8 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
    if (sc->lmc_next_tx - sc->lmc_taint_tx >= LMC_TXDESCS - 1)
    {                           /* ring full, go busy */
        sc->lmc_txfull = 1;
-        netif_stop_queue(dev);
+        netif_stop_queue(dev);
-        sc->stats.tx_tbusy1++ ;
+        sc->extra_stats.tx_tbusy1++;
        LMC_EVENT_LOG(LMC_EVENT_TBUSY1, entry, 0);
    }
 #endif
@@ -1550,7 +1475,7 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
     * the watchdog timer handler. -baz
     */
-    sc->stats.tx_NoCompleteCnt++;
+    sc->extra_stats.tx_NoCompleteCnt++;
    sc->lmc_next_tx++;
    /* give ownership to the chip */
@@ -1569,9 +1494,9 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
 }
-static int lmc_rx (struct net_device *dev) /*fold00*/
+static int lmc_rx(struct net_device *dev)
 {
-    lmc_softc_t *sc;
+    lmc_softc_t *sc = dev_to_sc(dev);
    int i;
    int rx_work_limit = LMC_RXDESCS;
    unsigned int next_rx;
@@ -1583,8 +1508,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
    lmc_trace(dev, "lmc_rx in");
-    sc = dev->priv;
    lmc_led_on(sc, LMC_DS3_LED3);
    rxIntLoopCnt = 0;           /* debug -baz */
@@ -1597,39 +1520,38 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
        rxIntLoopCnt++;         /* debug -baz */
        len = ((stat & LMC_RDES_FRAME_LENGTH) >> RDES_FRAME_LENGTH_BIT_NUMBER);
        if ((stat & 0x0300) != 0x0300) {  /* Check first segment and last segment */
-            if ((stat & 0x0000ffff) != 0x7fff) {
+                if ((stat & 0x0000ffff) != 0x7fff) {
-                /* Oversized frame */
+                        /* Oversized frame */
-                sc->stats.rx_length_errors++;
+                        sc->lmc_device->stats.rx_length_errors++;
-                goto skip_packet;
+                        goto skip_packet;
-            }
+                }
-        }
+        }
-        if(stat & 0x00000008){ /* Catch a dribbling bit error */
-            sc->stats.rx_errors++;
-            sc->stats.rx_frame_errors++;
-            goto skip_packet;
-        }
+        if (stat & 0x00000008) { /* Catch a dribbling bit error */
+                sc->lmc_device->stats.rx_errors++;
+                sc->lmc_device->stats.rx_frame_errors++;
+                goto skip_packet;
+        }
-        if(stat & 0x00000004){ /* Catch a CRC error by the Xilinx */
-            sc->stats.rx_errors++;
-            sc->stats.rx_crc_errors++;
-            goto skip_packet;
-        }
+        if (stat & 0x00000004) { /* Catch a CRC error by the Xilinx */
+                sc->lmc_device->stats.rx_errors++;
+                sc->lmc_device->stats.rx_crc_errors++;
+                goto skip_packet;
+        }
-        if (len > LMC_PKT_BUF_SZ){
+        if (len > LMC_PKT_BUF_SZ) {
-            sc->stats.rx_length_errors++;
+                sc->lmc_device->stats.rx_length_errors++;
-            localLengthErrCnt++;
+                localLengthErrCnt++;
-            goto skip_packet;
+                goto skip_packet;
-        }
+        }
-        if (len < sc->lmc_crcSize + 2) {
+        if (len < sc->lmc_crcSize + 2) {
-            sc->stats.rx_length_errors++;
+                sc->lmc_device->stats.rx_length_errors++;
-            sc->stats.rx_SmallPktCnt++;
+                sc->extra_stats.rx_SmallPktCnt++;
-            localLengthErrCnt++;
+                localLengthErrCnt++;
-            goto skip_packet;
+                goto skip_packet;
-        }
+        }
        if(stat & 0x00004000){
            printk(KERN_WARNING "%s: Receiver descriptor error, receiver out of sync?\n", dev->name);
@@ -1656,8 +1578,8 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
        }
        
        dev->last_rx = jiffies;
-        sc->stats.rx_packets++;
+        sc->lmc_device->stats.rx_packets++;
-        sc->stats.rx_bytes += len;
+        sc->lmc_device->stats.rx_bytes += len;
        LMC_CONSOLE_LOG("recv", skb->data, len);
@@ -1679,7 +1601,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
            skb_put (skb, len);
            skb->protocol = lmc_proto_type(sc, skb);
-            skb->protocol = htons(ETH_P_WAN_PPP);
            skb_reset_mac_header(skb);
            /* skb_reset_network_header(skb); */
            skb->dev = dev;
@@ -1704,7 +1625,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
                 * in which care we'll try to allocate the buffer
                 * again.  (once a second)
                 */
-                sc->stats.rx_BuffAllocErr++;
+                sc->extra_stats.rx_BuffAllocErr++;
                LMC_EVENT_LOG(LMC_EVENT_RCVINT, stat, len);
                sc->failed_recv_alloc = 1;
                goto skip_out_of_mem;
@@ -1739,16 +1660,14 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
     * descriptors with bogus packets
     *
    if (localLengthErrCnt > LMC_RXDESCS - 3) {
-        sc->stats.rx_BadPktSurgeCnt++;
+        sc->extra_stats.rx_BadPktSurgeCnt++;
-        LMC_EVENT_LOG(LMC_EVENT_BADPKTSURGE,
+        LMC_EVENT_LOG(LMC_EVENT_BADPKTSURGE, localLengthErrCnt,
-                      localLengthErrCnt,
+                      sc->extra_stats.rx_BadPktSurgeCnt);
-                      sc->stats.rx_BadPktSurgeCnt);
    } */
    /* save max count of receive descriptors serviced */
-    if (rxIntLoopCnt > sc->stats.rxIntLoopCnt) {
+    if (rxIntLoopCnt > sc->extra_stats.rxIntLoopCnt)
-        sc->stats.rxIntLoopCnt = rxIntLoopCnt;  /* debug -baz */
+            sc->extra_stats.rxIntLoopCnt = rxIntLoopCnt; /* debug -baz */
-    }
 #ifdef DEBUG
    if (rxIntLoopCnt == 0)
@@ -1775,23 +1694,22 @@ skip_out_of_mem:
    return 0;
 }
-static struct net_device_stats *lmc_get_stats (struct net_device *dev) /*fold00*/
+static struct net_device_stats *lmc_get_stats(struct net_device *dev)
 {
-    lmc_softc_t *sc = dev->priv;
+    lmc_softc_t *sc = dev_to_sc(dev);
    unsigned long flags;
    lmc_trace(dev, "lmc_get_stats in");
    spin_lock_irqsave(&sc->lmc_lock, flags);
-    sc->stats.rx_missed_errors += LMC_CSR_READ (sc, csr_missed_frames) & 0xffff;
+    sc->lmc_device->stats.rx_missed_errors += LMC_CSR_READ(sc, csr_missed_frames) & 0xffff;
    spin_unlock_irqrestore(&sc->lmc_lock, flags);
    lmc_trace(dev, "lmc_get_stats out");
-    return (struct net_device_stats *) &sc->stats;
+    return &sc->lmc_device->stats;
 }
 static struct pci_driver lmc_driver = {
@@ -1970,7 +1888,7 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/
    {
        if (sc->lmc_txq[i] != NULL){            /* have buffer */
            dev_kfree_skb(sc->lmc_txq[i]);      /* free it */
-            sc->stats.tx_dropped++;      /* We just dropped a packet */
+            sc->lmc_device->stats.tx_dropped++; /* We just dropped a packet */
        }
        sc->lmc_txq[i] = NULL;
        sc->lmc_txring[i].status = 0x00000000;
@@ -1982,7 +1900,7 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/
    lmc_trace(sc->lmc_device, "lmc_softreset out");
 }
-void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/
+void lmc_gpio_mkinput(lmc_softc_t * const sc, u32 bits) /*fold00*/
 {
    lmc_trace(sc->lmc_device, "lmc_gpio_mkinput in");
    sc->lmc_gpio_io &= ~bits;
@@ -1990,7 +1908,7 @@ void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/
    lmc_trace(sc->lmc_device, "lmc_gpio_mkinput out");
 }
-void lmc_gpio_mkoutput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/
+void lmc_gpio_mkoutput(lmc_softc_t * const sc, u32 bits) /*fold00*/
 {
    lmc_trace(sc->lmc_device, "lmc_gpio_mkoutput in");
    sc->lmc_gpio_io |= bits;
@@ -1998,7 +1916,7 @@ void lmc_gpio_mkoutput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/
    lmc_trace(sc->lmc_device, "lmc_gpio_mkoutput out");
 }
-void lmc_led_on(lmc_softc_t * const sc, u_int32_t led) /*fold00*/
+void lmc_led_on(lmc_softc_t * const sc, u32 led) /*fold00*/
 {
    lmc_trace(sc->lmc_device, "lmc_led_on in");
    if((~sc->lmc_miireg16) & led){ /* Already on! */
@@ -2011,7 +1929,7 @@ void lmc_led_on(lmc_softc_t * const sc, u_int32_t led) /*fold00*/
    lmc_trace(sc->lmc_device, "lmc_led_on out");
 }
-void lmc_led_off(lmc_softc_t * const sc, u_int32_t led) /*fold00*/
+void lmc_led_off(lmc_softc_t * const sc, u32 led) /*fold00*/
 {
    lmc_trace(sc->lmc_device, "lmc_led_off in");
    if(sc->lmc_miireg16 & led){ /* Already set don't do anything */
@@ -2061,13 +1979,13 @@ static void lmc_reset(lmc_softc_t * const sc) /*fold00*/
     */
    sc->lmc_media->init(sc);
-    sc->stats.resetCount++;
+    sc->extra_stats.resetCount++;
    lmc_trace(sc->lmc_device, "lmc_reset out");
 }
 static void lmc_dec_reset(lmc_softc_t * const sc) /*fold00*/
 {
-    u_int32_t val;
+    u32 val;
    lmc_trace(sc->lmc_device, "lmc_dec_reset in");
    /*
@@ -2151,23 +2069,21 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, /*fold00
    lmc_trace(sc->lmc_device, "lmc_initcsrs out");
 }
-static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/
+static void lmc_driver_timeout(struct net_device *dev)
-    lmc_softc_t *sc;
+{
+    lmc_softc_t *sc = dev_to_sc(dev);
    u32 csr6;
    unsigned long flags;
    lmc_trace(dev, "lmc_driver_timeout in");
-    sc = dev->priv;
    spin_lock_irqsave(&sc->lmc_lock, flags);
    printk("%s: Xmitter busy|\n", dev->name);
-    sc->stats.tx_tbusy_calls++ ;
+    sc->extra_stats.tx_tbusy_calls++;
-    if (jiffies - dev->trans_start < TX_TIMEOUT) {
+    if (jiffies - dev->trans_start < TX_TIMEOUT)
-        goto bug_out;
+            goto bug_out;
-    }
    /*
     * Chip seems to have locked up
@@ -2178,7 +2094,7 @@ static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/
    LMC_EVENT_LOG(LMC_EVENT_XMTPRCTMO,
                  LMC_CSR_READ (sc, csr_status),
-                  sc->stats.tx_ProcTimeout);
+                  sc->extra_stats.tx_ProcTimeout);
    lmc_running_reset (dev);
@@ -2195,8 +2111,8 @@ static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/
    /* immediate transmit */
    LMC_CSR_WRITE (sc, csr_txpoll, 0);
-    sc->stats.tx_errors++;
+    sc->lmc_device->stats.tx_errors++;
-    sc->stats.tx_ProcTimeout++; /* -baz */
+    sc->extra_stats.tx_ProcTimeout++; /* -baz */
    dev->trans_start = jiffies;