[PARISC] fix lasi_82596 build
[sfrench/cifs-2.6.git] / drivers / net / pcnet32.c
index d50bcb89dd2898564b6c86a8e516113f59c263ef..9c171a7390e2b4ab09e5a77f3fee8c19732e05d3 100644 (file)
  *************************************************************************/
 
 #define DRV_NAME       "pcnet32"
-#define DRV_VERSION    "1.32"
-#define DRV_RELDATE    "18.Mar.2006"
+#ifdef CONFIG_PCNET32_NAPI
+#define DRV_VERSION    "1.33-NAPI"
+#else
+#define DRV_VERSION    "1.33"
+#endif
+#define DRV_RELDATE    "27.Jun.2006"
 #define PFX            DRV_NAME ": "
 
 static const char *const version =
@@ -207,7 +211,7 @@ static int homepna[MAX_UNITS];
 /* The PCNET32 Rx and Tx ring descriptors. */
 struct pcnet32_rx_head {
        u32     base;
-       s16     buf_length;
+       s16     buf_length;     /* two`s complement of length */
        s16     status;
        u32     msg_length;
        u32     reserved;
@@ -215,7 +219,7 @@ struct pcnet32_rx_head {
 
 struct pcnet32_tx_head {
        u32     base;
-       s16     length;
+       s16     length;         /* two`s complement of length */
        s16     status;
        u32     misc;
        u32     reserved;
@@ -249,12 +253,12 @@ struct pcnet32_access {
  * so the structure should be allocated using pci_alloc_consistent().
  */
 struct pcnet32_private {
-       struct pcnet32_init_block init_block;
+       struct pcnet32_init_block *init_block;
        /* The Tx and Rx ring entries must be aligned on 16-byte boundaries in 32bit mode. */
        struct pcnet32_rx_head  *rx_ring;
        struct pcnet32_tx_head  *tx_ring;
-       dma_addr_t              dma_addr;/* DMA address of beginning of this
-                                  object, returned by pci_alloc_consistent */
+       dma_addr_t              init_dma_addr;/* DMA address of beginning of the init block,
+                                  returned by pci_alloc_consistent */
        struct pci_dev          *pci_dev;
        const char              *name;
        /* The saved address of a sent-in-place packet/buffer, for skfree(). */
@@ -299,9 +303,8 @@ static int pcnet32_probe1(unsigned long, int, struct pci_dev *);
 static int pcnet32_open(struct net_device *);
 static int pcnet32_init_ring(struct net_device *);
 static int pcnet32_start_xmit(struct sk_buff *, struct net_device *);
-static int pcnet32_rx(struct net_device *);
 static void pcnet32_tx_timeout(struct net_device *dev);
-static irqreturn_t pcnet32_interrupt(int, void *, struct pt_regs *);
+static irqreturn_t pcnet32_interrupt(int, void *);
 static int pcnet32_close(struct net_device *);
 static struct net_device_stats *pcnet32_get_stats(struct net_device *);
 static void pcnet32_load_multicast(struct net_device *dev);
@@ -650,7 +653,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
 
 static void pcnet32_purge_rx_ring(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int i;
 
        /* free all allocated skbuffs */
@@ -671,14 +674,14 @@ static void pcnet32_purge_rx_ring(struct net_device *dev)
 static void pcnet32_poll_controller(struct net_device *dev)
 {
        disable_irq(dev->irq);
-       pcnet32_interrupt(0, dev, NULL);
+       pcnet32_interrupt(0, dev);
        enable_irq(dev->irq);
 }
 #endif
 
 static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
        int r = -EOPNOTSUPP;
 
@@ -693,7 +696,7 @@ static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 
 static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
        int r = -EOPNOTSUPP;
 
@@ -708,7 +711,7 @@ static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 static void pcnet32_get_drvinfo(struct net_device *dev,
                                struct ethtool_drvinfo *info)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
 
        strcpy(info->driver, DRV_NAME);
        strcpy(info->version, DRV_VERSION);
@@ -720,7 +723,7 @@ static void pcnet32_get_drvinfo(struct net_device *dev,
 
 static u32 pcnet32_get_link(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
        int r;
 
@@ -740,19 +743,19 @@ static u32 pcnet32_get_link(struct net_device *dev)
 
 static u32 pcnet32_get_msglevel(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        return lp->msg_enable;
 }
 
 static void pcnet32_set_msglevel(struct net_device *dev, u32 value)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        lp->msg_enable = value;
 }
 
 static int pcnet32_nway_reset(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
        int r = -EOPNOTSUPP;
 
@@ -767,7 +770,7 @@ static int pcnet32_nway_reset(struct net_device *dev)
 static void pcnet32_get_ringparam(struct net_device *dev,
                                  struct ethtool_ringparam *ering)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
 
        ering->tx_max_pending = TX_MAX_RING_SIZE;
        ering->tx_pending = lp->tx_ring_size;
@@ -778,7 +781,7 @@ static void pcnet32_get_ringparam(struct net_device *dev,
 static int pcnet32_set_ringparam(struct net_device *dev,
                                 struct ethtool_ringparam *ering)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
        unsigned int size;
        ulong ioaddr = dev->base_addr;
@@ -804,7 +807,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,
        }
        if ((1 << i) != lp->tx_ring_size)
                pcnet32_realloc_tx_ring(dev, lp, i);
-       
+
        size = min(ering->rx_pending, (unsigned int)RX_MAX_RING_SIZE);
        for (i = 2; i <= PCNET32_LOG_MAX_RX_BUFFERS; i++) {
                if (size <= (1 << i))
@@ -812,7 +815,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,
        }
        if ((1 << i) != lp->rx_ring_size)
                pcnet32_realloc_rx_ring(dev, lp, i);
-       
+
        dev->weight = lp->rx_ring_size / 2;
 
        if (netif_running(dev)) {
@@ -844,7 +847,7 @@ static int pcnet32_self_test_count(struct net_device *dev)
 static void pcnet32_ethtool_test(struct net_device *dev,
                                 struct ethtool_test *test, u64 * data)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int rc;
 
        if (test->flags == ETH_TEST_FL_OFFLINE) {
@@ -865,7 +868,7 @@ static void pcnet32_ethtool_test(struct net_device *dev,
 
 static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        struct pcnet32_access *a = &lp->a;      /* access to registers */
        ulong ioaddr = dev->base_addr;  /* card base I/O address */
        struct sk_buff *skb;    /* sk buff */
@@ -883,7 +886,11 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        rc = 1;                 /* default to fail */
 
        if (netif_running(dev))
+#ifdef CONFIG_PCNET32_NAPI
+               pcnet32_netif_stop(dev);
+#else
                pcnet32_close(dev);
+#endif
 
        spin_lock_irqsave(&lp->lock, flags);
        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
@@ -892,7 +899,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
 
        /* Reset the PCNET32 */
        lp->a.reset(ioaddr);
-       lp->a.write_csr(ioaddr, CSR4, 0x0915);
+       lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
 
        /* switch pcnet32 to 32bit mode */
        lp->a.write_bcr(ioaddr, 20, 2);
@@ -1015,6 +1022,16 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        x = a->read_bcr(ioaddr, 32);    /* reset internal loopback */
        a->write_bcr(ioaddr, 32, (x & ~0x0002));
 
+#ifdef CONFIG_PCNET32_NAPI
+       if (netif_running(dev)) {
+               pcnet32_netif_start(dev);
+               pcnet32_restart(dev, CSR0_NORMAL);
+       } else {
+               pcnet32_purge_rx_ring(dev);
+               lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
+       }
+       spin_unlock_irqrestore(&lp->lock, flags);
+#else
        if (netif_running(dev)) {
                spin_unlock_irqrestore(&lp->lock, flags);
                pcnet32_open(dev);
@@ -1023,13 +1040,14 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
                spin_unlock_irqrestore(&lp->lock, flags);
        }
+#endif
 
        return (rc);
 }                              /* end pcnet32_loopback_test  */
 
 static void pcnet32_led_blink_callback(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        struct pcnet32_access *a = &lp->a;
        ulong ioaddr = dev->base_addr;
        unsigned long flags;
@@ -1046,7 +1064,7 @@ static void pcnet32_led_blink_callback(struct net_device *dev)
 
 static int pcnet32_phys_id(struct net_device *dev, u32 data)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        struct pcnet32_access *a = &lp->a;
        ulong ioaddr = dev->base_addr;
        unsigned long flags;
@@ -1091,7 +1109,7 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
                int can_sleep)
 {
        int csr5;
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        struct pcnet32_access *a = &lp->a;
        ulong ioaddr = dev->base_addr;
        int ticks;
@@ -1125,11 +1143,292 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
        return 1;
 }
 
+/*
+ * process one receive descriptor entry
+ */
+
+static void pcnet32_rx_entry(struct net_device *dev,
+                            struct pcnet32_private *lp,
+                            struct pcnet32_rx_head *rxp,
+                            int entry)
+{
+       int status = (short)le16_to_cpu(rxp->status) >> 8;
+       int rx_in_place = 0;
+       struct sk_buff *skb;
+       short pkt_len;
+
+       if (status != 0x03) {   /* There was an error. */
+               /*
+                * There is a tricky error noted by John Murphy,
+                * <murf@perftech.com> to Russ Nelson: Even with full-sized
+                * buffers it's possible for a jabber packet to use two
+                * buffers, with only the last correctly noting the error.
+                */
+               if (status & 0x01)      /* Only count a general error at the */
+                       lp->stats.rx_errors++;  /* end of a packet. */
+               if (status & 0x20)
+                       lp->stats.rx_frame_errors++;
+               if (status & 0x10)
+                       lp->stats.rx_over_errors++;
+               if (status & 0x08)
+                       lp->stats.rx_crc_errors++;
+               if (status & 0x04)
+                       lp->stats.rx_fifo_errors++;
+               return;
+       }
+
+       pkt_len = (le32_to_cpu(rxp->msg_length) & 0xfff) - 4;
+
+       /* Discard oversize frames. */
+       if (unlikely(pkt_len > PKT_BUF_SZ - 2)) {
+               if (netif_msg_drv(lp))
+                       printk(KERN_ERR "%s: Impossible packet size %d!\n",
+                              dev->name, pkt_len);
+               lp->stats.rx_errors++;
+               return;
+       }
+       if (pkt_len < 60) {
+               if (netif_msg_rx_err(lp))
+                       printk(KERN_ERR "%s: Runt packet!\n", dev->name);
+               lp->stats.rx_errors++;
+               return;
+       }
+
+       if (pkt_len > rx_copybreak) {
+               struct sk_buff *newskb;
+
+               if ((newskb = dev_alloc_skb(PKT_BUF_SZ))) {
+                       skb_reserve(newskb, 2);
+                       skb = lp->rx_skbuff[entry];
+                       pci_unmap_single(lp->pci_dev,
+                                        lp->rx_dma_addr[entry],
+                                        PKT_BUF_SZ - 2,
+                                        PCI_DMA_FROMDEVICE);
+                       skb_put(skb, pkt_len);
+                       lp->rx_skbuff[entry] = newskb;
+                       lp->rx_dma_addr[entry] =
+                                           pci_map_single(lp->pci_dev,
+                                                          newskb->data,
+                                                          PKT_BUF_SZ - 2,
+                                                          PCI_DMA_FROMDEVICE);
+                       rxp->base = le32_to_cpu(lp->rx_dma_addr[entry]);
+                       rx_in_place = 1;
+               } else
+                       skb = NULL;
+       } else {
+               skb = dev_alloc_skb(pkt_len + 2);
+       }
+
+       if (skb == NULL) {
+               if (netif_msg_drv(lp))
+                       printk(KERN_ERR
+                              "%s: Memory squeeze, dropping packet.\n",
+                              dev->name);
+               lp->stats.rx_dropped++;
+               return;
+       }
+       skb->dev = dev;
+       if (!rx_in_place) {
+               skb_reserve(skb, 2);    /* 16 byte align */
+               skb_put(skb, pkt_len);  /* Make room */
+               pci_dma_sync_single_for_cpu(lp->pci_dev,
+                                           lp->rx_dma_addr[entry],
+                                           pkt_len,
+                                           PCI_DMA_FROMDEVICE);
+               eth_copy_and_sum(skb,
+                                (unsigned char *)(lp->rx_skbuff[entry]->data),
+                                pkt_len, 0);
+               pci_dma_sync_single_for_device(lp->pci_dev,
+                                              lp->rx_dma_addr[entry],
+                                              pkt_len,
+                                              PCI_DMA_FROMDEVICE);
+       }
+       lp->stats.rx_bytes += skb->len;
+       skb->protocol = eth_type_trans(skb, dev);
+#ifdef CONFIG_PCNET32_NAPI
+       netif_receive_skb(skb);
+#else
+       netif_rx(skb);
+#endif
+       dev->last_rx = jiffies;
+       lp->stats.rx_packets++;
+       return;
+}
+
+static int pcnet32_rx(struct net_device *dev, int quota)
+{
+       struct pcnet32_private *lp = netdev_priv(dev);
+       int entry = lp->cur_rx & lp->rx_mod_mask;
+       struct pcnet32_rx_head *rxp = &lp->rx_ring[entry];
+       int npackets = 0;
+
+       /* If we own the next entry, it's a new packet. Send it up. */
+       while (quota > npackets && (short)le16_to_cpu(rxp->status) >= 0) {
+               pcnet32_rx_entry(dev, lp, rxp, entry);
+               npackets += 1;
+               /*
+                * The docs say that the buffer length isn't touched, but Andrew
+                * Boyd of QNX reports that some revs of the 79C965 clear it.
+                */
+               rxp->buf_length = le16_to_cpu(2 - PKT_BUF_SZ);
+               wmb();  /* Make sure owner changes after others are visible */
+               rxp->status = le16_to_cpu(0x8000);
+               entry = (++lp->cur_rx) & lp->rx_mod_mask;
+               rxp = &lp->rx_ring[entry];
+       }
+
+       return npackets;
+}
+
+static int pcnet32_tx(struct net_device *dev)
+{
+       struct pcnet32_private *lp = netdev_priv(dev);
+       unsigned int dirty_tx = lp->dirty_tx;
+       int delta;
+       int must_restart = 0;
+
+       while (dirty_tx != lp->cur_tx) {
+               int entry = dirty_tx & lp->tx_mod_mask;
+               int status = (short)le16_to_cpu(lp->tx_ring[entry].status);
+
+               if (status < 0)
+                       break;  /* It still hasn't been Txed */
+
+               lp->tx_ring[entry].base = 0;
+
+               if (status & 0x4000) {
+                       /* There was a major error, log it. */
+                       int err_status = le32_to_cpu(lp->tx_ring[entry].misc);
+                       lp->stats.tx_errors++;
+                       if (netif_msg_tx_err(lp))
+                               printk(KERN_ERR
+                                      "%s: Tx error status=%04x err_status=%08x\n",
+                                      dev->name, status,
+                                      err_status);
+                       if (err_status & 0x04000000)
+                               lp->stats.tx_aborted_errors++;
+                       if (err_status & 0x08000000)
+                               lp->stats.tx_carrier_errors++;
+                       if (err_status & 0x10000000)
+                               lp->stats.tx_window_errors++;
+#ifndef DO_DXSUFLO
+                       if (err_status & 0x40000000) {
+                               lp->stats.tx_fifo_errors++;
+                               /* Ackk!  On FIFO errors the Tx unit is turned off! */
+                               /* Remove this verbosity later! */
+                               if (netif_msg_tx_err(lp))
+                                       printk(KERN_ERR
+                                              "%s: Tx FIFO error!\n",
+                                              dev->name);
+                               must_restart = 1;
+                       }
+#else
+                       if (err_status & 0x40000000) {
+                               lp->stats.tx_fifo_errors++;
+                               if (!lp->dxsuflo) {     /* If controller doesn't recover ... */
+                                       /* Ackk!  On FIFO errors the Tx unit is turned off! */
+                                       /* Remove this verbosity later! */
+                                       if (netif_msg_tx_err(lp))
+                                               printk(KERN_ERR
+                                                      "%s: Tx FIFO error!\n",
+                                                      dev->name);
+                                       must_restart = 1;
+                               }
+                       }
+#endif
+               } else {
+                       if (status & 0x1800)
+                               lp->stats.collisions++;
+                       lp->stats.tx_packets++;
+               }
+
+               /* We must free the original skb */
+               if (lp->tx_skbuff[entry]) {
+                       pci_unmap_single(lp->pci_dev,
+                                        lp->tx_dma_addr[entry],
+                                        lp->tx_skbuff[entry]->
+                                        len, PCI_DMA_TODEVICE);
+                       dev_kfree_skb_any(lp->tx_skbuff[entry]);
+                       lp->tx_skbuff[entry] = NULL;
+                       lp->tx_dma_addr[entry] = 0;
+               }
+               dirty_tx++;
+       }
+
+       delta = (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask + lp->tx_ring_size);
+       if (delta > lp->tx_ring_size) {
+               if (netif_msg_drv(lp))
+                       printk(KERN_ERR
+                              "%s: out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
+                              dev->name, dirty_tx, lp->cur_tx,
+                              lp->tx_full);
+               dirty_tx += lp->tx_ring_size;
+               delta -= lp->tx_ring_size;
+       }
+
+       if (lp->tx_full &&
+           netif_queue_stopped(dev) &&
+           delta < lp->tx_ring_size - 2) {
+               /* The ring is no longer full, clear tbusy. */
+               lp->tx_full = 0;
+               netif_wake_queue(dev);
+       }
+       lp->dirty_tx = dirty_tx;
+
+       return must_restart;
+}
+
+#ifdef CONFIG_PCNET32_NAPI
+static int pcnet32_poll(struct net_device *dev, int *budget)
+{
+       struct pcnet32_private *lp = netdev_priv(dev);
+       int quota = min(dev->quota, *budget);
+       unsigned long ioaddr = dev->base_addr;
+       unsigned long flags;
+       u16 val;
+
+       quota = pcnet32_rx(dev, quota);
+
+       spin_lock_irqsave(&lp->lock, flags);
+       if (pcnet32_tx(dev)) {
+               /* reset the chip to clear the error condition, then restart */
+               lp->a.reset(ioaddr);
+               lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
+               pcnet32_restart(dev, CSR0_START);
+               netif_wake_queue(dev);
+       }
+       spin_unlock_irqrestore(&lp->lock, flags);
+
+       *budget -= quota;
+       dev->quota -= quota;
+
+       if (dev->quota == 0) {
+               return 1;
+       }
+
+       netif_rx_complete(dev);
+
+       spin_lock_irqsave(&lp->lock, flags);
+
+       /* clear interrupt masks */
+       val = lp->a.read_csr(ioaddr, CSR3);
+       val &= 0x00ff;
+       lp->a.write_csr(ioaddr, CSR3, val);
+
+       /* Set interrupt enable. */
+       lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
+       mmiowb();
+       spin_unlock_irqrestore(&lp->lock, flags);
+
+       return 0;
+}
+#endif
+
 #define PCNET32_REGS_PER_PHY   32
 #define PCNET32_MAX_PHYS       32
 static int pcnet32_get_regs_len(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int j = lp->phycount * PCNET32_REGS_PER_PHY;
 
        return ((PCNET32_NUM_REGS + j) * sizeof(u16));
@@ -1140,7 +1439,7 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 {
        int i, csr0;
        u16 *buff = ptr;
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        struct pcnet32_access *a = &lp->a;
        ulong ioaddr = dev->base_addr;
        unsigned long flags;
@@ -1197,7 +1496,7 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
        spin_unlock_irqrestore(&lp->lock, flags);
 }
 
-static struct ethtool_ops pcnet32_ethtool_ops = {
+static const struct ethtool_ops pcnet32_ethtool_ops = {
        .get_settings           = pcnet32_get_settings,
        .set_settings           = pcnet32_set_settings,
        .get_drvinfo            = pcnet32_get_drvinfo,
@@ -1293,7 +1592,6 @@ static int __devinit
 pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 {
        struct pcnet32_private *lp;
-       dma_addr_t lp_dma_addr;
        int i, media;
        int fdx, mii, fset, dxsuflo;
        int chip_version;
@@ -1415,7 +1713,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                dxsuflo = 1;
        }
 
-       dev = alloc_etherdev(0);
+       dev = alloc_etherdev(sizeof(*lp));
        if (!dev) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
                        printk(KERN_ERR PFX "Memory allocation failed.\n");
@@ -1506,25 +1804,22 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
        }
 
        dev->base_addr = ioaddr;
+       lp = netdev_priv(dev);
        /* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */
-       if ((lp =
-            pci_alloc_consistent(pdev, sizeof(*lp), &lp_dma_addr)) == NULL) {
+       if ((lp->init_block =
+            pci_alloc_consistent(pdev, sizeof(*lp->init_block), &lp->init_dma_addr)) == NULL) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
                        printk(KERN_ERR PFX
                               "Consistent memory allocation failed.\n");
                ret = -ENOMEM;
                goto err_free_netdev;
        }
-
-       memset(lp, 0, sizeof(*lp));
-       lp->dma_addr = lp_dma_addr;
        lp->pci_dev = pdev;
 
        spin_lock_init(&lp->lock);
 
        SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
-       dev->priv = lp;
        lp->name = chipname;
        lp->shared_irq = shared;
        lp->tx_ring_size = TX_RING_SIZE;        /* default tx ring size */
@@ -1571,23 +1866,21 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
            && dev->dev_addr[2] == 0x75)
                lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
 
-       lp->init_block.mode = le16_to_cpu(0x0003);      /* Disable Rx and Tx. */
-       lp->init_block.tlen_rlen =
+       lp->init_block->mode = le16_to_cpu(0x0003);     /* Disable Rx and Tx. */
+       lp->init_block->tlen_rlen =
            le16_to_cpu(lp->tx_len_bits | lp->rx_len_bits);
        for (i = 0; i < 6; i++)
-               lp->init_block.phys_addr[i] = dev->dev_addr[i];
-       lp->init_block.filter[0] = 0x00000000;
-       lp->init_block.filter[1] = 0x00000000;
-       lp->init_block.rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
-       lp->init_block.tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
+               lp->init_block->phys_addr[i] = dev->dev_addr[i];
+       lp->init_block->filter[0] = 0x00000000;
+       lp->init_block->filter[1] = 0x00000000;
+       lp->init_block->rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
+       lp->init_block->tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
 
        /* switch pcnet32 to 32bit mode */
        a->write_bcr(ioaddr, 20, 2);
 
-       a->write_csr(ioaddr, 1, (lp->dma_addr + offsetof(struct pcnet32_private,
-                                                        init_block)) & 0xffff);
-       a->write_csr(ioaddr, 2, (lp->dma_addr + offsetof(struct pcnet32_private,
-                                                        init_block)) >> 16);
+       a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
+       a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
 
        if (pdev) {             /* use the IRQ provided by PCI */
                dev->irq = pdev->irq;
@@ -1602,7 +1895,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 * boards will work.
                 */
                /* Trigger an initialization just for the interrupt. */
-               a->write_csr(ioaddr, 0, 0x41);
+               a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_INIT);
                mdelay(1);
 
                dev->irq = probe_irq_off(irq_mask);
@@ -1661,6 +1954,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
        dev->ethtool_ops = &pcnet32_ethtool_ops;
        dev->tx_timeout = pcnet32_tx_timeout;
        dev->watchdog_timeo = (5 * HZ);
+       dev->weight = lp->rx_ring_size / 2;
+#ifdef CONFIG_PCNET32_NAPI
+       dev->poll = pcnet32_poll;
+#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
        dev->poll_controller = pcnet32_poll_controller;
@@ -1689,7 +1986,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
       err_free_ring:
        pcnet32_free_ring(dev);
       err_free_consistent:
-       pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
+       pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), 
+                           lp->init_block, lp->init_dma_addr);
       err_free_netdev:
        free_netdev(dev);
       err_release_region:
@@ -1700,7 +1998,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 /* if any allocation fails, caller must also call pcnet32_free_ring */
 static int pcnet32_alloc_ring(struct net_device *dev, char *name)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
 
        lp->tx_ring = pci_alloc_consistent(lp->pci_dev,
                                           sizeof(struct pcnet32_tx_head) *
@@ -1767,7 +2065,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)
 
 static void pcnet32_free_ring(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
 
        kfree(lp->tx_skbuff);
        lp->tx_skbuff = NULL;
@@ -1800,7 +2098,7 @@ static void pcnet32_free_ring(struct net_device *dev)
 
 static int pcnet32_open(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr;
        u16 val;
        int i;
@@ -1831,8 +2129,7 @@ static int pcnet32_open(struct net_device *dev)
                       "%s: pcnet32_open() irq %d tx/rx rings %#x/%#x init %#x.\n",
                       dev->name, dev->irq, (u32) (lp->tx_ring_dma_addr),
                       (u32) (lp->rx_ring_dma_addr),
-                      (u32) (lp->dma_addr +
-                             offsetof(struct pcnet32_private, init_block)));
+                      (u32) (lp->init_dma_addr));
 
        /* set/reset autoselect bit */
        val = lp->a.read_bcr(ioaddr, 2) & ~2;
@@ -1965,13 +2262,13 @@ static int pcnet32_open(struct net_device *dev)
 
 #ifdef DO_DXSUFLO
        if (lp->dxsuflo) {      /* Disable transmit stop on underflow */
-               val = lp->a.read_csr(ioaddr, 3);
+               val = lp->a.read_csr(ioaddr, CSR3);
                val |= 0x40;
-               lp->a.write_csr(ioaddr, 3, val);
+               lp->a.write_csr(ioaddr, CSR3, val);
        }
 #endif
 
-       lp->init_block.mode =
+       lp->init_block->mode =
            le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
        pcnet32_load_multicast(dev);
 
@@ -1981,15 +2278,11 @@ static int pcnet32_open(struct net_device *dev)
        }
 
        /* Re-initialize the PCNET32, and start it when done. */
-       lp->a.write_csr(ioaddr, 1, (lp->dma_addr +
-                                   offsetof(struct pcnet32_private,
-                                            init_block)) & 0xffff);
-       lp->a.write_csr(ioaddr, 2,
-                       (lp->dma_addr +
-                        offsetof(struct pcnet32_private, init_block)) >> 16);
+       lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
+       lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
 
-       lp->a.write_csr(ioaddr, 4, 0x0915);
-       lp->a.write_csr(ioaddr, 0, 0x0001);
+       lp->a.write_csr(ioaddr, CSR4, 0x0915);  /* auto tx pad */
+       lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
 
        netif_start_queue(dev);
 
@@ -2001,21 +2294,20 @@ static int pcnet32_open(struct net_device *dev)
 
        i = 0;
        while (i++ < 100)
-               if (lp->a.read_csr(ioaddr, 0) & 0x0100)
+               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
                        break;
        /*
         * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
         * reports that doing so triggers a bug in the '974.
         */
-       lp->a.write_csr(ioaddr, 0, 0x0042);
+       lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
 
        if (netif_msg_ifup(lp))
                printk(KERN_DEBUG
                       "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n",
                       dev->name, i,
-                      (u32) (lp->dma_addr +
-                             offsetof(struct pcnet32_private, init_block)),
-                      lp->a.read_csr(ioaddr, 0));
+                      (u32) (lp->init_dma_addr),
+                      lp->a.read_csr(ioaddr, CSR0));
 
        spin_unlock_irqrestore(&lp->lock, flags);
 
@@ -2052,7 +2344,7 @@ static int pcnet32_open(struct net_device *dev)
 
 static void pcnet32_purge_tx_ring(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int i;
 
        for (i = 0; i < lp->tx_ring_size; i++) {
@@ -2072,7 +2364,7 @@ static void pcnet32_purge_tx_ring(struct net_device *dev)
 /* Initialize the PCNET32 Rx and Tx rings. */
 static int pcnet32_init_ring(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int i;
 
        lp->tx_full = 0;
@@ -2086,7 +2378,7 @@ static int pcnet32_init_ring(struct net_device *dev)
                            (rx_skbuff = lp->rx_skbuff[i] =
                             dev_alloc_skb(PKT_BUF_SZ))) {
                                /* there is not much, we can do at this point */
-                               if (pcnet32_debug & NETIF_MSG_DRV)
+                               if (netif_msg_drv(lp))
                                        printk(KERN_ERR
                                               "%s: pcnet32_init_ring dev_alloc_skb failed.\n",
                                               dev->name);
@@ -2114,12 +2406,12 @@ static int pcnet32_init_ring(struct net_device *dev)
                lp->tx_dma_addr[i] = 0;
        }
 
-       lp->init_block.tlen_rlen =
+       lp->init_block->tlen_rlen =
            le16_to_cpu(lp->tx_len_bits | lp->rx_len_bits);
        for (i = 0; i < 6; i++)
-               lp->init_block.phys_addr[i] = dev->dev_addr[i];
-       lp->init_block.rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
-       lp->init_block.tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
+               lp->init_block->phys_addr[i] = dev->dev_addr[i];
+       lp->init_block->rx_ring = (u32) le32_to_cpu(lp->rx_ring_dma_addr);
+       lp->init_block->tx_ring = (u32) le32_to_cpu(lp->tx_ring_dma_addr);
        wmb();                  /* Make sure all changes are visible */
        return 0;
 }
@@ -2130,13 +2422,13 @@ static int pcnet32_init_ring(struct net_device *dev)
  */
 static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr;
        int i;
 
        /* wait for stop */
        for (i = 0; i < 100; i++)
-               if (lp->a.read_csr(ioaddr, 0) & 0x0004)
+               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
                        break;
 
        if (i >= 100 && netif_msg_drv(lp))
@@ -2149,18 +2441,18 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
                return;
 
        /* ReInit Ring */
-       lp->a.write_csr(ioaddr, 0, 1);
+       lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
        i = 0;
        while (i++ < 1000)
-               if (lp->a.read_csr(ioaddr, 0) & 0x0100)
+               if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
                        break;
 
-       lp->a.write_csr(ioaddr, 0, csr0_bits);
+       lp->a.write_csr(ioaddr, CSR0, csr0_bits);
 }
 
 static void pcnet32_tx_timeout(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr, flags;
 
        spin_lock_irqsave(&lp->lock, flags);
@@ -2168,8 +2460,8 @@ static void pcnet32_tx_timeout(struct net_device *dev)
        if (pcnet32_debug & NETIF_MSG_DRV)
                printk(KERN_ERR
                       "%s: transmit timed out, status %4.4x, resetting.\n",
-                      dev->name, lp->a.read_csr(ioaddr, 0));
-       lp->a.write_csr(ioaddr, 0, 0x0004);
+                      dev->name, lp->a.read_csr(ioaddr, CSR0));
+       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
        lp->stats.tx_errors++;
        if (netif_msg_tx_err(lp)) {
                int i;
@@ -2191,7 +2483,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)
                               le16_to_cpu(lp->tx_ring[i].status));
                printk("\n");
        }
-       pcnet32_restart(dev, 0x0042);
+       pcnet32_restart(dev, CSR0_NORMAL);
 
        dev->trans_start = jiffies;
        netif_wake_queue(dev);
@@ -2201,7 +2493,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)
 
 static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr;
        u16 status;
        int entry;
@@ -2212,7 +2504,7 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
        if (netif_msg_tx_queued(lp)) {
                printk(KERN_DEBUG
                       "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, 0));
+                      dev->name, lp->a.read_csr(ioaddr, CSR0));
        }
 
        /* Default status -- will not enable Successful-TxDone
@@ -2243,7 +2535,7 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
        lp->stats.tx_bytes += skb->len;
 
        /* Trigger an immediate send poll. */
-       lp->a.write_csr(ioaddr, 0, 0x0048);
+       lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
 
        dev->trans_start = jiffies;
 
@@ -2257,162 +2549,47 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 /* The PCNET32 interrupt handler. */
 static irqreturn_t
-pcnet32_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+pcnet32_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
        struct pcnet32_private *lp;
        unsigned long ioaddr;
-       u16 csr0, rap;
+       u16 csr0;
        int boguscnt = max_interrupt_work;
-       int must_restart;
-
-       if (!dev) {
-               if (pcnet32_debug & NETIF_MSG_INTR)
-                       printk(KERN_DEBUG "%s(): irq %d for unknown device\n",
-                              __FUNCTION__, irq);
-               return IRQ_NONE;
-       }
 
        ioaddr = dev->base_addr;
-       lp = dev->priv;
+       lp = netdev_priv(dev);
 
        spin_lock(&lp->lock);
 
-       rap = lp->a.read_rap(ioaddr);
-       while ((csr0 = lp->a.read_csr(ioaddr, 0)) & 0x8f00 && --boguscnt >= 0) {
+       csr0 = lp->a.read_csr(ioaddr, CSR0);
+       while ((csr0 & 0x8f00) && --boguscnt >= 0) {
                if (csr0 == 0xffff) {
                        break;  /* PCMCIA remove happened */
                }
                /* Acknowledge all of the current interrupt sources ASAP. */
-               lp->a.write_csr(ioaddr, 0, csr0 & ~0x004f);
-
-               must_restart = 0;
+               lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
 
                if (netif_msg_intr(lp))
                        printk(KERN_DEBUG
                               "%s: interrupt  csr0=%#2.2x new csr=%#2.2x.\n",
-                              dev->name, csr0, lp->a.read_csr(ioaddr, 0));
-
-               if (csr0 & 0x0400)      /* Rx interrupt */
-                       pcnet32_rx(dev);
-
-               if (csr0 & 0x0200) {    /* Tx-done interrupt */
-                       unsigned int dirty_tx = lp->dirty_tx;
-                       int delta;
-
-                       while (dirty_tx != lp->cur_tx) {
-                               int entry = dirty_tx & lp->tx_mod_mask;
-                               int status =
-                                   (short)le16_to_cpu(lp->tx_ring[entry].
-                                                      status);
-
-                               if (status < 0)
-                                       break;  /* It still hasn't been Txed */
-
-                               lp->tx_ring[entry].base = 0;
-
-                               if (status & 0x4000) {
-                                       /* There was an major error, log it. */
-                                       int err_status =
-                                           le32_to_cpu(lp->tx_ring[entry].
-                                                       misc);
-                                       lp->stats.tx_errors++;
-                                       if (netif_msg_tx_err(lp))
-                                               printk(KERN_ERR
-                                                      "%s: Tx error status=%04x err_status=%08x\n",
-                                                      dev->name, status,
-                                                      err_status);
-                                       if (err_status & 0x04000000)
-                                               lp->stats.tx_aborted_errors++;
-                                       if (err_status & 0x08000000)
-                                               lp->stats.tx_carrier_errors++;
-                                       if (err_status & 0x10000000)
-                                               lp->stats.tx_window_errors++;
-#ifndef DO_DXSUFLO
-                                       if (err_status & 0x40000000) {
-                                               lp->stats.tx_fifo_errors++;
-                                               /* Ackk!  On FIFO errors the Tx unit is turned off! */
-                                               /* Remove this verbosity later! */
-                                               if (netif_msg_tx_err(lp))
-                                                       printk(KERN_ERR
-                                                              "%s: Tx FIFO error! CSR0=%4.4x\n",
-                                                              dev->name, csr0);
-                                               must_restart = 1;
-                                       }
-#else
-                                       if (err_status & 0x40000000) {
-                                               lp->stats.tx_fifo_errors++;
-                                               if (!lp->dxsuflo) {     /* If controller doesn't recover ... */
-                                                       /* Ackk!  On FIFO errors the Tx unit is turned off! */
-                                                       /* Remove this verbosity later! */
-                                                       if (netif_msg_tx_err
-                                                           (lp))
-                                                               printk(KERN_ERR
-                                                                      "%s: Tx FIFO error! CSR0=%4.4x\n",
-                                                                      dev->
-                                                                      name,
-                                                                      csr0);
-                                                       must_restart = 1;
-                                               }
-                                       }
-#endif
-                               } else {
-                                       if (status & 0x1800)
-                                               lp->stats.collisions++;
-                                       lp->stats.tx_packets++;
-                               }
-
-                               /* We must free the original skb */
-                               if (lp->tx_skbuff[entry]) {
-                                       pci_unmap_single(lp->pci_dev,
-                                                        lp->tx_dma_addr[entry],
-                                                        lp->tx_skbuff[entry]->
-                                                        len, PCI_DMA_TODEVICE);
-                                       dev_kfree_skb_irq(lp->tx_skbuff[entry]);
-                                       lp->tx_skbuff[entry] = NULL;
-                                       lp->tx_dma_addr[entry] = 0;
-                               }
-                               dirty_tx++;
-                       }
-
-                       delta =
-                           (lp->cur_tx - dirty_tx) & (lp->tx_mod_mask +
-                                                      lp->tx_ring_size);
-                       if (delta > lp->tx_ring_size) {
-                               if (netif_msg_drv(lp))
-                                       printk(KERN_ERR
-                                              "%s: out-of-sync dirty pointer, %d vs. %d, full=%d.\n",
-                                              dev->name, dirty_tx, lp->cur_tx,
-                                              lp->tx_full);
-                               dirty_tx += lp->tx_ring_size;
-                               delta -= lp->tx_ring_size;
-                       }
-
-                       if (lp->tx_full &&
-                           netif_queue_stopped(dev) &&
-                           delta < lp->tx_ring_size - 2) {
-                               /* The ring is no longer full, clear tbusy. */
-                               lp->tx_full = 0;
-                               netif_wake_queue(dev);
-                       }
-                       lp->dirty_tx = dirty_tx;
-               }
+                              dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
 
                /* Log misc errors. */
                if (csr0 & 0x4000)
                        lp->stats.tx_errors++;  /* Tx babble. */
                if (csr0 & 0x1000) {
                        /*
-                        * this happens when our receive ring is full. This shouldn't
-                        * be a problem as we will see normal rx interrupts for the frames
-                        * in the receive ring. But there are some PCI chipsets (I can
-                        * reproduce this on SP3G with Intel saturn chipset) which have
-                        * sometimes problems and will fill up the receive ring with
-                        * error descriptors. In this situation we don't get a rx
-                        * interrupt, but a missed frame interrupt sooner or later.
-                        * So we try to clean up our receive ring here.
+                        * This happens when our receive ring is full. This
+                        * shouldn't be a problem as we will see normal rx
+                        * interrupts for the frames in the receive ring.  But
+                        * there are some PCI chipsets (I can reproduce this
+                        * on SP3G with Intel saturn chipset) which have
+                        * sometimes problems and will fill up the receive
+                        * ring with error descriptors.  In this situation we
+                        * don't get a rx interrupt, but a missed frame
+                        * interrupt sooner or later.
                         */
-                       pcnet32_rx(dev);
                        lp->stats.rx_errors++;  /* Missed a Rx frame. */
                }
                if (csr0 & 0x0800) {
@@ -2422,189 +2599,48 @@ pcnet32_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                       dev->name, csr0);
                        /* unlike for the lance, there is no restart needed */
                }
-
-               if (must_restart) {
+#ifdef CONFIG_PCNET32_NAPI
+               if (netif_rx_schedule_prep(dev)) {
+                       u16 val;
+                       /* set interrupt masks */
+                       val = lp->a.read_csr(ioaddr, CSR3);
+                       val |= 0x5f00;
+                       lp->a.write_csr(ioaddr, CSR3, val);
+                       mmiowb();
+                       __netif_rx_schedule(dev);
+                       break;
+               }
+#else
+               pcnet32_rx(dev, dev->weight);
+               if (pcnet32_tx(dev)) {
                        /* reset the chip to clear the error condition, then restart */
                        lp->a.reset(ioaddr);
-                       lp->a.write_csr(ioaddr, 4, 0x0915);
-                       pcnet32_restart(dev, 0x0002);
+                       lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
+                       pcnet32_restart(dev, CSR0_START);
                        netif_wake_queue(dev);
                }
+#endif
+               csr0 = lp->a.read_csr(ioaddr, CSR0);
        }
 
+#ifndef CONFIG_PCNET32_NAPI
        /* Set interrupt enable. */
-       lp->a.write_csr(ioaddr, 0, 0x0040);
-       lp->a.write_rap(ioaddr, rap);
+       lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
+#endif
 
        if (netif_msg_intr(lp))
                printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, 0));
+                      dev->name, lp->a.read_csr(ioaddr, CSR0));
 
        spin_unlock(&lp->lock);
 
        return IRQ_HANDLED;
 }
 
-static int pcnet32_rx(struct net_device *dev)
-{
-       struct pcnet32_private *lp = dev->priv;
-       int entry = lp->cur_rx & lp->rx_mod_mask;
-       int boguscnt = lp->rx_ring_size / 2;
-
-       /* If we own the next entry, it's a new packet. Send it up. */
-       while ((short)le16_to_cpu(lp->rx_ring[entry].status) >= 0) {
-               int status = (short)le16_to_cpu(lp->rx_ring[entry].status) >> 8;
-
-               if (status != 0x03) {   /* There was an error. */
-                       /*
-                        * There is a tricky error noted by John Murphy,
-                        * <murf@perftech.com> to Russ Nelson: Even with full-sized
-                        * buffers it's possible for a jabber packet to use two
-                        * buffers, with only the last correctly noting the error.
-                        */
-                       if (status & 0x01)      /* Only count a general error at the */
-                               lp->stats.rx_errors++;  /* end of a packet. */
-                       if (status & 0x20)
-                               lp->stats.rx_frame_errors++;
-                       if (status & 0x10)
-                               lp->stats.rx_over_errors++;
-                       if (status & 0x08)
-                               lp->stats.rx_crc_errors++;
-                       if (status & 0x04)
-                               lp->stats.rx_fifo_errors++;
-                       lp->rx_ring[entry].status &= le16_to_cpu(0x03ff);
-               } else {
-                       /* Malloc up new buffer, compatible with net-2e. */
-                       short pkt_len =
-                           (le32_to_cpu(lp->rx_ring[entry].msg_length) & 0xfff)
-                           - 4;
-                       struct sk_buff *skb;
-
-                       /* Discard oversize frames. */
-                       if (unlikely(pkt_len > PKT_BUF_SZ - 2)) {
-                               if (netif_msg_drv(lp))
-                                       printk(KERN_ERR
-                                              "%s: Impossible packet size %d!\n",
-                                              dev->name, pkt_len);
-                               lp->stats.rx_errors++;
-                       } else if (pkt_len < 60) {
-                               if (netif_msg_rx_err(lp))
-                                       printk(KERN_ERR "%s: Runt packet!\n",
-                                              dev->name);
-                               lp->stats.rx_errors++;
-                       } else {
-                               int rx_in_place = 0;
-
-                               if (pkt_len > rx_copybreak) {
-                                       struct sk_buff *newskb;
-
-                                       if ((newskb =
-                                            dev_alloc_skb(PKT_BUF_SZ))) {
-                                               skb_reserve(newskb, 2);
-                                               skb = lp->rx_skbuff[entry];
-                                               pci_unmap_single(lp->pci_dev,
-                                                                lp->
-                                                                rx_dma_addr
-                                                                [entry],
-                                                                PKT_BUF_SZ - 2,
-                                                                PCI_DMA_FROMDEVICE);
-                                               skb_put(skb, pkt_len);
-                                               lp->rx_skbuff[entry] = newskb;
-                                               newskb->dev = dev;
-                                               lp->rx_dma_addr[entry] =
-                                                   pci_map_single(lp->pci_dev,
-                                                                  newskb->data,
-                                                                  PKT_BUF_SZ -
-                                                                  2,
-                                                                  PCI_DMA_FROMDEVICE);
-                                               lp->rx_ring[entry].base =
-                                                   le32_to_cpu(lp->
-                                                               rx_dma_addr
-                                                               [entry]);
-                                               rx_in_place = 1;
-                                       } else
-                                               skb = NULL;
-                               } else {
-                                       skb = dev_alloc_skb(pkt_len + 2);
-                               }
-
-                               if (skb == NULL) {
-                                       int i;
-                                       if (netif_msg_drv(lp))
-                                               printk(KERN_ERR
-                                                      "%s: Memory squeeze, deferring packet.\n",
-                                                      dev->name);
-                                       for (i = 0; i < lp->rx_ring_size; i++)
-                                               if ((short)
-                                                   le16_to_cpu(lp->
-                                                               rx_ring[(entry +
-                                                                        i)
-                                                                       & lp->
-                                                                       rx_mod_mask].
-                                                               status) < 0)
-                                                       break;
-
-                                       if (i > lp->rx_ring_size - 2) {
-                                               lp->stats.rx_dropped++;
-                                               lp->rx_ring[entry].status |=
-                                                   le16_to_cpu(0x8000);
-                                               wmb();  /* Make sure adapter sees owner change */
-                                               lp->cur_rx++;
-                                       }
-                                       break;
-                               }
-                               skb->dev = dev;
-                               if (!rx_in_place) {
-                                       skb_reserve(skb, 2);    /* 16 byte align */
-                                       skb_put(skb, pkt_len);  /* Make room */
-                                       pci_dma_sync_single_for_cpu(lp->pci_dev,
-                                                                   lp->
-                                                                   rx_dma_addr
-                                                                   [entry],
-                                                                   PKT_BUF_SZ -
-                                                                   2,
-                                                                   PCI_DMA_FROMDEVICE);
-                                       eth_copy_and_sum(skb,
-                                                        (unsigned char *)(lp->
-                                                                          rx_skbuff
-                                                                          [entry]->
-                                                                          data),
-                                                        pkt_len, 0);
-                                       pci_dma_sync_single_for_device(lp->
-                                                                      pci_dev,
-                                                                      lp->
-                                                                      rx_dma_addr
-                                                                      [entry],
-                                                                      PKT_BUF_SZ
-                                                                      - 2,
-                                                                      PCI_DMA_FROMDEVICE);
-                               }
-                               lp->stats.rx_bytes += skb->len;
-                               skb->protocol = eth_type_trans(skb, dev);
-                               netif_rx(skb);
-                               dev->last_rx = jiffies;
-                               lp->stats.rx_packets++;
-                       }
-               }
-               /*
-                * The docs say that the buffer length isn't touched, but Andrew Boyd
-                * of QNX reports that some revs of the 79C965 clear it.
-                */
-               lp->rx_ring[entry].buf_length = le16_to_cpu(2 - PKT_BUF_SZ);
-               wmb();          /* Make sure owner changes after all others are visible */
-               lp->rx_ring[entry].status |= le16_to_cpu(0x8000);
-               entry = (++lp->cur_rx) & lp->rx_mod_mask;
-               if (--boguscnt <= 0)
-                       break;  /* don't stay in loop forever */
-       }
-
-       return 0;
-}
-
 static int pcnet32_close(struct net_device *dev)
 {
        unsigned long ioaddr = dev->base_addr;
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
 
        del_timer_sync(&lp->watchdog_timer);
@@ -2618,10 +2654,10 @@ static int pcnet32_close(struct net_device *dev)
        if (netif_msg_ifdown(lp))
                printk(KERN_DEBUG
                       "%s: Shutting down ethercard, status was %2.2x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, 0));
+                      dev->name, lp->a.read_csr(ioaddr, CSR0));
 
        /* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
-       lp->a.write_csr(ioaddr, 0, 0x0004);
+       lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
 
        /*
         * Switch back to 16bit mode to avoid problems with dumb
@@ -2645,15 +2681,12 @@ static int pcnet32_close(struct net_device *dev)
 
 static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr;
-       u16 saved_addr;
        unsigned long flags;
 
        spin_lock_irqsave(&lp->lock, flags);
-       saved_addr = lp->a.read_rap(ioaddr);
        lp->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
-       lp->a.write_rap(ioaddr, saved_addr);
        spin_unlock_irqrestore(&lp->lock, flags);
 
        return &lp->stats;
@@ -2662,8 +2695,8 @@ static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
 /* taken from the sunlance driver, which it took from the depca driver */
 static void pcnet32_load_multicast(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
-       volatile struct pcnet32_init_block *ib = &lp->init_block;
+       struct pcnet32_private *lp = netdev_priv(dev);
+       volatile struct pcnet32_init_block *ib = lp->init_block;
        volatile u16 *mcast_table = (u16 *) & ib->filter;
        struct dev_mc_list *dmi = dev->mc_list;
        unsigned long ioaddr = dev->base_addr;
@@ -2712,7 +2745,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
 static void pcnet32_set_multicast_list(struct net_device *dev)
 {
        unsigned long ioaddr = dev->base_addr, flags;
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int csr15, suspended;
 
        spin_lock_irqsave(&lp->lock, flags);
@@ -2723,12 +2756,12 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
                if (netif_msg_hw(lp))
                        printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
                               dev->name);
-               lp->init_block.mode =
+               lp->init_block->mode =
                    le16_to_cpu(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
                                7);
                lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
        } else {
-               lp->init_block.mode =
+               lp->init_block->mode =
                    le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
                lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
                pcnet32_load_multicast(dev);
@@ -2739,7 +2772,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
                /* clear SUSPEND (SPND) - CSR5 bit 0 */
                csr5 = lp->a.read_csr(ioaddr, CSR5);
                lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
-       } else { 
+       } else {
                lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
                pcnet32_restart(dev, CSR0_NORMAL);
                netif_wake_queue(dev);
@@ -2751,7 +2784,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
 /* This routine assumes that the lp->lock is held */
 static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr;
        u16 val_out;
 
@@ -2767,7 +2800,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
 /* This routine assumes that the lp->lock is held */
 static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long ioaddr = dev->base_addr;
 
        if (!lp->mii)
@@ -2779,7 +2812,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
 
 static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int rc;
        unsigned long flags;
 
@@ -2797,7 +2830,7 @@ static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 static int pcnet32_check_otherphy(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        struct mii_if_info mii = lp->mii_if;
        u16 bmcr;
        int i;
@@ -2844,7 +2877,7 @@ static int pcnet32_check_otherphy(struct net_device *dev)
 
 static void pcnet32_check_media(struct net_device *dev, int verbose)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        int curr_link;
        int prev_link = netif_carrier_ok(dev) ? 1 : 0;
        u32 bcr9;
@@ -2900,7 +2933,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
 
 static void pcnet32_watchdog(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned long flags;
 
        /* Print the link status if it has changed */
@@ -2916,12 +2949,13 @@ static void __devexit pcnet32_remove_one(struct pci_dev *pdev)
        struct net_device *dev = pci_get_drvdata(pdev);
 
        if (dev) {
-               struct pcnet32_private *lp = dev->priv;
+               struct pcnet32_private *lp = netdev_priv(dev);
 
                unregister_netdev(dev);
                pcnet32_free_ring(dev);
                release_region(dev->base_addr, PCNET32_TOTAL_SIZE);
-               pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
+               pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), 
+                                   lp->init_block, lp->init_dma_addr);
                free_netdev(dev);
                pci_disable_device(pdev);
                pci_set_drvdata(pdev, NULL);
@@ -2978,7 +3012,7 @@ static int __init pcnet32_init_module(void)
                tx_start = tx_start_pt;
 
        /* find the PCI devices */
-       if (!pci_module_init(&pcnet32_driver))
+       if (!pci_register_driver(&pcnet32_driver))
                pcnet32_have_pci = 1;
 
        /* should we find any remaining VLbus devices ? */
@@ -2996,12 +3030,13 @@ static void __exit pcnet32_cleanup_module(void)
        struct net_device *next_dev;
 
        while (pcnet32_dev) {
-               struct pcnet32_private *lp = pcnet32_dev->priv;
+               struct pcnet32_private *lp = netdev_priv(pcnet32_dev);
                next_dev = lp->next;
                unregister_netdev(pcnet32_dev);
                pcnet32_free_ring(pcnet32_dev);
                release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE);
-               pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
+               pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), 
+                                   lp->init_block, lp->init_dma_addr);
                free_netdev(pcnet32_dev);
                pcnet32_dev = next_dev;
        }