Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6.git] / drivers / net / pcnet32.c
index bf72aa8..084d78d 100644 (file)
  *
  *************************************************************************/
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define DRV_NAME       "pcnet32"
-#define DRV_VERSION    "1.32"
-#define DRV_RELDATE    "18.Mar.2006"
+#define DRV_VERSION    "1.35"
+#define DRV_RELDATE    "21.Apr.2008"
 #define PFX            DRV_NAME ": "
 
 static const char *const version =
@@ -31,6 +33,7 @@ static const char *const version =
 
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
@@ -44,20 +47,21 @@ static const char *const version =
 #include <linux/crc32.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/moduleparam.h>
 #include <linux/bitops.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 
 #include <asm/dma.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/irq.h>
 
 /*
  * PCI device identifiers for "new style" Linux PCI Device Drivers
  */
-static struct pci_device_id pcnet32_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(pcnet32_pci_tbl) = {
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
 
@@ -81,7 +85,7 @@ static int cards_found;
 static unsigned int pcnet32_portlist[] __initdata =
     { 0x300, 0x320, 0x340, 0x360, 0 };
 
-static int pcnet32_debug = 0;
+static int pcnet32_debug;
 static int tx_start = 1;       /* Mapping -- 0:20, 1:64, 2:128, 3:~220 (depends on chip vers) */
 static int pcnet32vlb;         /* check for VLB cards ? */
 
@@ -133,7 +137,7 @@ static const char pcnet32_gstrings_test[][ETH_GSTRING_LEN] = {
        "Loopback test  (offline)"
 };
 
-#define PCNET32_TEST_LEN (sizeof(pcnet32_gstrings_test) / ETH_GSTRING_LEN)
+#define PCNET32_TEST_LEN       ARRAY_SIZE(pcnet32_gstrings_test)
 
 #define PCNET32_NUM_REGS 136
 
@@ -170,7 +174,11 @@ static int homepna[MAX_UNITS];
 #define RX_RING_SIZE           (1 << (PCNET32_LOG_RX_BUFFERS))
 #define RX_MAX_RING_SIZE       (1 << (PCNET32_LOG_MAX_RX_BUFFERS))
 
-#define PKT_BUF_SZ             1544
+#define PKT_BUF_SKB            1544
+/* actual buffer length after being aligned */
+#define PKT_BUF_SIZE           (PKT_BUF_SKB - NET_IP_ALIGN)
+/* chip wants twos complement of the (aligned) buffer length */
+#define NEG_BUF_SIZE           (NET_IP_ALIGN - PKT_BUF_SKB)
 
 /* Offsets from base I/O address. */
 #define PCNET32_WIO_RDP                0x10
@@ -206,31 +214,31 @@ static int homepna[MAX_UNITS];
 
 /* The PCNET32 Rx and Tx ring descriptors. */
 struct pcnet32_rx_head {
-       u32     base;
-       s16     buf_length;     /* two`s complement of length */
-       s16     status;
-       u32     msg_length;
-       u32     reserved;
+       __le32  base;
+       __le16  buf_length;     /* two`s complement of length */
+       __le16  status;
+       __le32  msg_length;
+       __le32  reserved;
 };
 
 struct pcnet32_tx_head {
-       u32     base;
-       s16     length;         /* two`s complement of length */
-       s16     status;
-       u32     misc;
-       u32     reserved;
+       __le32  base;
+       __le16  length;         /* two`s complement of length */
+       __le16  status;
+       __le32  misc;
+       __le32  reserved;
 };
 
 /* The PCNET32 32-Bit initialization block, described in databook. */
 struct pcnet32_init_block {
-       u16     mode;
-       u16     tlen_rlen;
+       __le16  mode;
+       __le16  tlen_rlen;
        u8      phys_addr[6];
-       u16     reserved;
-       u32     filter[2];
+       __le16  reserved;
+       __le32  filter[2];
        /* Receive and transmit ring base, along with extra bits. */
-       u32     rx_ring;
-       u32     tx_ring;
+       __le32  rx_ring;
+       __le32  tx_ring;
 };
 
 /* PCnet32 access functions */
@@ -249,12 +257,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(). */
@@ -276,7 +284,8 @@ struct pcnet32_private {
        unsigned int            dirty_rx,       /* ring entries to be freed. */
                                dirty_tx;
 
-       struct net_device_stats stats;
+       struct net_device       *dev;
+       struct napi_struct      napi;
        char                    tx_full;
        char                    phycount;       /* number of phys found */
        int                     options;
@@ -298,9 +307,10 @@ static int pcnet32_probe_pci(struct pci_dev *, const struct pci_device_id *);
 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 netdev_tx_t pcnet32_start_xmit(struct sk_buff *,
+                                     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);
@@ -320,7 +330,7 @@ static int pcnet32_get_regs_len(struct net_device *dev);
 static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
                             void *ptr);
 static void pcnet32_purge_tx_ring(struct net_device *dev);
-static int pcnet32_alloc_ring(struct net_device *dev, char *name);
+static int pcnet32_alloc_ring(struct net_device *dev, const char *name);
 static void pcnet32_free_ring(struct net_device *dev);
 static void pcnet32_check_media(struct net_device *dev, int verbose);
 
@@ -382,7 +392,7 @@ static struct pcnet32_access pcnet32_wio = {
 static u16 pcnet32_dwio_read_csr(unsigned long addr, int index)
 {
        outl(index, addr + PCNET32_DWIO_RAP);
-       return (inl(addr + PCNET32_DWIO_RDP) & 0xffff);
+       return inl(addr + PCNET32_DWIO_RDP) & 0xffff;
 }
 
 static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
@@ -394,7 +404,7 @@ static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
 static u16 pcnet32_dwio_read_bcr(unsigned long addr, int index)
 {
        outl(index, addr + PCNET32_DWIO_RAP);
-       return (inl(addr + PCNET32_DWIO_BDP) & 0xffff);
+       return inl(addr + PCNET32_DWIO_BDP) & 0xffff;
 }
 
 static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
@@ -405,7 +415,7 @@ static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
 
 static u16 pcnet32_dwio_read_rap(unsigned long addr)
 {
-       return (inl(addr + PCNET32_DWIO_RAP) & 0xffff);
+       return inl(addr + PCNET32_DWIO_RAP) & 0xffff;
 }
 
 static void pcnet32_dwio_write_rap(unsigned long addr, u16 val)
@@ -436,15 +446,24 @@ static struct pcnet32_access pcnet32_dwio = {
 
 static void pcnet32_netif_stop(struct net_device *dev)
 {
+       struct pcnet32_private *lp = netdev_priv(dev);
+
        dev->trans_start = jiffies;
-       netif_poll_disable(dev);
+       napi_disable(&lp->napi);
        netif_tx_disable(dev);
 }
 
 static void pcnet32_netif_start(struct net_device *dev)
 {
+       struct pcnet32_private *lp = netdev_priv(dev);
+       ulong ioaddr = dev->base_addr;
+       u16 val;
+
        netif_wake_queue(dev);
-       netif_poll_enable(dev);
+       val = lp->a.read_csr(ioaddr, CSR3);
+       val &= 0x00ff;
+       lp->a.write_csr(ioaddr, CSR3, val);
+       napi_enable(&lp->napi);
 }
 
 /*
@@ -470,10 +489,7 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
                                           (1 << size),
                                           &new_ring_dma_addr);
        if (new_tx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Consistent memory allocation failed.\n",
-                              dev->name);
+               netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                return;
        }
        memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size));
@@ -481,18 +497,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
        new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
                                GFP_ATOMIC);
        if (!new_dma_addr_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                goto free_new_tx_ring;
        }
 
        new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
                                GFP_ATOMIC);
        if (!new_skb_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                goto free_new_lists;
        }
 
@@ -512,15 +524,14 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,
        lp->tx_skbuff = new_skb_list;
        return;
 
-    free_new_lists:
+free_new_lists:
        kfree(new_dma_addr_list);
-    free_new_tx_ring:
+free_new_tx_ring:
        pci_free_consistent(lp->pci_dev,
                            sizeof(struct pcnet32_tx_head) *
                            (1 << size),
                            new_tx_ring,
                            new_ring_dma_addr);
-       return;
 }
 
 /*
@@ -548,10 +559,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
                                           (1 << size),
                                           &new_ring_dma_addr);
        if (new_rx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Consistent memory allocation failed.\n",
-                              dev->name);
+               netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                return;
        }
        memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * (1 << size));
@@ -559,18 +567,14 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
        new_dma_addr_list = kcalloc((1 << size), sizeof(dma_addr_t),
                                GFP_ATOMIC);
        if (!new_dma_addr_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                goto free_new_rx_ring;
        }
 
        new_skb_list = kcalloc((1 << size), sizeof(struct sk_buff *),
                                GFP_ATOMIC);
        if (!new_skb_list) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR
-                              "%s: Memory allocation failed.\n", dev->name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                goto free_new_lists;
        }
 
@@ -582,31 +586,30 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
                new_skb_list[new] = lp->rx_skbuff[new];
        }
        /* now allocate any new buffers needed */
-       for (; new < size; new++ ) {
+       for (; new < size; new++) {
                struct sk_buff *rx_skbuff;
-               new_skb_list[new] = dev_alloc_skb(PKT_BUF_SZ);
-               if (!(rx_skbuff = new_skb_list[new])) {
+               new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
+               rx_skbuff = new_skb_list[new];
+               if (!rx_skbuff) {
                        /* keep the original lists and buffers */
-                       if (netif_msg_drv(lp))
-                               printk(KERN_ERR
-                                      "%s: pcnet32_realloc_rx_ring dev_alloc_skb failed.\n",
-                                      dev->name);
+                       netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                                 __func__);
                        goto free_all_new;
                }
-               skb_reserve(rx_skbuff, 2);
+               skb_reserve(rx_skbuff, NET_IP_ALIGN);
 
                new_dma_addr_list[new] =
                            pci_map_single(lp->pci_dev, rx_skbuff->data,
-                                          PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
-               new_rx_ring[new].base = (u32) le32_to_cpu(new_dma_addr_list[new]);
-               new_rx_ring[new].buf_length = le16_to_cpu(2 - PKT_BUF_SZ);
-               new_rx_ring[new].status = le16_to_cpu(0x8000);
+                                          PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
+               new_rx_ring[new].base = cpu_to_le32(new_dma_addr_list[new]);
+               new_rx_ring[new].buf_length = cpu_to_le16(NEG_BUF_SIZE);
+               new_rx_ring[new].status = cpu_to_le16(0x8000);
        }
        /* and free any unneeded buffers */
        for (; new < lp->rx_ring_size; new++) {
                if (lp->rx_skbuff[new]) {
                        pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[new],
-                                        PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
+                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(lp->rx_skbuff[new]);
                }
        }
@@ -627,18 +630,18 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
        lp->rx_skbuff = new_skb_list;
        return;
 
-    free_all_new:
-       for (; --new >= lp->rx_ring_size; ) {
+free_all_new:
+       while (--new >= lp->rx_ring_size) {
                if (new_skb_list[new]) {
                        pci_unmap_single(lp->pci_dev, new_dma_addr_list[new],
-                                        PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
+                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb(new_skb_list[new]);
                }
        }
        kfree(new_skb_list);
-    free_new_lists:
+free_new_lists:
        kfree(new_dma_addr_list);
-    free_new_rx_ring:
+free_new_rx_ring:
        pci_free_consistent(lp->pci_dev,
                            sizeof(struct pcnet32_rx_head) *
                            (1 << size),
@@ -649,7 +652,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 */
@@ -658,7 +661,7 @@ static void pcnet32_purge_rx_ring(struct net_device *dev)
                wmb();          /* Make sure adapter sees owner change */
                if (lp->rx_skbuff[i]) {
                        pci_unmap_single(lp->pci_dev, lp->rx_dma_addr[i],
-                                        PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
+                                        PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
                        dev_kfree_skb_any(lp->rx_skbuff[i]);
                }
                lp->rx_skbuff[i] = NULL;
@@ -670,14 +673,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;
 
@@ -692,7 +695,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;
 
@@ -707,7 +710,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);
@@ -719,7 +722,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;
 
@@ -739,19 +742,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;
 
@@ -766,7 +769,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;
@@ -777,7 +780,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;
@@ -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;
+       lp->napi.weight = lp->rx_ring_size / 2;
 
        if (netif_running(dev)) {
                pcnet32_netif_start(dev);
@@ -821,57 +824,58 @@ static int pcnet32_set_ringparam(struct net_device *dev,
 
        spin_unlock_irqrestore(&lp->lock, flags);
 
-       if (netif_msg_drv(lp))
-               printk(KERN_INFO
-                      "%s: Ring Param Settings: RX: %d, TX: %d\n", dev->name,
-                      lp->rx_ring_size, lp->tx_ring_size);
+       netif_info(lp, drv, dev, "Ring Param Settings: RX: %d, TX: %d\n",
+                  lp->rx_ring_size, lp->tx_ring_size);
 
        return 0;
 }
 
 static void pcnet32_get_strings(struct net_device *dev, u32 stringset,
-                               u8 * data)
+                               u8 *data)
 {
        memcpy(data, pcnet32_gstrings_test, sizeof(pcnet32_gstrings_test));
 }
 
-static int pcnet32_self_test_count(struct net_device *dev)
+static int pcnet32_get_sset_count(struct net_device *dev, int sset)
 {
-       return PCNET32_TEST_LEN;
+       switch (sset) {
+       case ETH_SS_TEST:
+               return PCNET32_TEST_LEN;
+       default:
+               return -EOPNOTSUPP;
+       }
 }
 
 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) {
                rc = pcnet32_loopback_test(dev, data);
                if (rc) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG "%s: Loopback test failed.\n",
-                                      dev->name);
+                       netif_printk(lp, hw, KERN_DEBUG, dev,
+                                    "Loopback test failed\n");
                        test->flags |= ETH_TEST_FL_FAILED;
-               } else if (netif_msg_hw(lp))
-                       printk(KERN_DEBUG "%s: Loopback test passed.\n",
-                              dev->name);
-       } else if (netif_msg_hw(lp))
-               printk(KERN_DEBUG
-                      "%s: No tests to run (specify 'Offline' on ethtool).",
-                      dev->name);
+               } else
+                       netif_printk(lp, hw, KERN_DEBUG, dev,
+                                    "Loopback test passed\n");
+       } else
+               netif_printk(lp, hw, KERN_DEBUG, dev,
+                            "No tests to run (specify 'Offline' on ethtool)\n");
 }                              /* end pcnet32_ethtool_test */
 
 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 */
        int x, i;               /* counters */
        int numbuffs = 4;       /* number of TX/RX buffers and descs */
        u16 status = 0x8300;    /* TX ring status */
-       u16 teststatus;         /* test of ring status */
+       __le16 teststatus;      /* test of ring status */
        int rc;                 /* return code */
        int size;               /* size of packets */
        unsigned char *packet;  /* source packet data */
@@ -882,7 +886,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        rc = 1;                 /* default to fail */
 
        if (netif_running(dev))
-               pcnet32_close(dev);
+               pcnet32_netif_stop(dev);
 
        spin_lock_irqsave(&lp->lock, flags);
        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* stop the chip */
@@ -904,41 +908,39 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        /* Initialize Transmit buffers. */
        size = data_len + 15;
        for (x = 0; x < numbuffs; x++) {
-               if (!(skb = dev_alloc_skb(size))) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Cannot allocate skb at line: %d!\n",
-                                      dev->name, __LINE__);
+               skb = dev_alloc_skb(size);
+               if (!skb) {
+                       netif_printk(lp, hw, KERN_DEBUG, dev,
+                                    "Cannot allocate skb at line: %d!\n",
+                                    __LINE__);
                        goto clean_up;
-               } else {
-                       packet = skb->data;
-                       skb_put(skb, size);     /* create space for data */
-                       lp->tx_skbuff[x] = skb;
-                       lp->tx_ring[x].length = le16_to_cpu(-skb->len);
-                       lp->tx_ring[x].misc = 0;
-
-                       /* put DA and SA into the skb */
-                       for (i = 0; i < 6; i++)
-                               *packet++ = dev->dev_addr[i];
-                       for (i = 0; i < 6; i++)
-                               *packet++ = dev->dev_addr[i];
-                       /* type */
-                       *packet++ = 0x08;
-                       *packet++ = 0x06;
-                       /* packet number */
-                       *packet++ = x;
-                       /* fill packet with data */
-                       for (i = 0; i < data_len; i++)
-                               *packet++ = i;
-
-                       lp->tx_dma_addr[x] =
-                           pci_map_single(lp->pci_dev, skb->data, skb->len,
-                                          PCI_DMA_TODEVICE);
-                       lp->tx_ring[x].base =
-                           (u32) le32_to_cpu(lp->tx_dma_addr[x]);
-                       wmb();  /* Make sure owner changes after all others are visible */
-                       lp->tx_ring[x].status = le16_to_cpu(status);
                }
+               packet = skb->data;
+               skb_put(skb, size);     /* create space for data */
+               lp->tx_skbuff[x] = skb;
+               lp->tx_ring[x].length = cpu_to_le16(-skb->len);
+               lp->tx_ring[x].misc = 0;
+
+               /* put DA and SA into the skb */
+               for (i = 0; i < 6; i++)
+                       *packet++ = dev->dev_addr[i];
+               for (i = 0; i < 6; i++)
+                       *packet++ = dev->dev_addr[i];
+               /* type */
+               *packet++ = 0x08;
+               *packet++ = 0x06;
+               /* packet number */
+               *packet++ = x;
+               /* fill packet with data */
+               for (i = 0; i < data_len; i++)
+                       *packet++ = i;
+
+               lp->tx_dma_addr[x] =
+                       pci_map_single(lp->pci_dev, skb->data, skb->len,
+                                      PCI_DMA_TODEVICE);
+               lp->tx_ring[x].base = cpu_to_le32(lp->tx_dma_addr[x]);
+               wmb();  /* Make sure owner changes after all others are visible */
+               lp->tx_ring[x].status = cpu_to_le16(status);
        }
 
        x = a->read_bcr(ioaddr, 32);    /* set internal loopback in BCR32 */
@@ -948,7 +950,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        x = a->read_csr(ioaddr, CSR15) & 0xfffc;
        lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
 
-       teststatus = le16_to_cpu(0x8000);
+       teststatus = cpu_to_le16(0x8000);
        lp->a.write_csr(ioaddr, CSR0, CSR0_START);      /* Set STRT bit */
 
        /* Check status of descriptors */
@@ -963,9 +965,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                        ticks++;
                }
                if (ticks == 200) {
-                       if (netif_msg_hw(lp))
-                               printk("%s: Desc %d failed to reset!\n",
-                                      dev->name, x);
+                       netif_err(lp, hw, dev, "Desc %d failed to reset!\n", x);
                        break;
                }
        }
@@ -973,15 +973,14 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);       /* Set STOP bit */
        wmb();
        if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
-               printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
+               netdev_printk(KERN_DEBUG, dev, "RX loopback packets:\n");
 
                for (x = 0; x < numbuffs; x++) {
-                       printk(KERN_DEBUG "%s: Packet %d:\n", dev->name, x);
+                       netdev_printk(KERN_DEBUG, dev, "Packet %d: ", x);
                        skb = lp->rx_skbuff[x];
-                       for (i = 0; i < size; i++) {
-                               printk("%02x ", *(skb->data + i));
-                       }
-                       printk("\n");
+                       for (i = 0; i < size; i++)
+                               pr_cont(" %02x", *(skb->data + i));
+                       pr_cont("\n");
                }
        }
 
@@ -992,11 +991,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                packet = lp->tx_skbuff[x]->data;
                for (i = 0; i < size; i++) {
                        if (*(skb->data + i) != packet[i]) {
-                               if (netif_msg_hw(lp))
-                                       printk(KERN_DEBUG
-                                              "%s: Error in compare! %2x - %02x %02x\n",
-                                              dev->name, i, *(skb->data + i),
-                                              packet[i]);
+                               netif_printk(lp, hw, KERN_DEBUG, dev,
+                                            "Error in compare! %2x - %02x %02x\n",
+                                            i, *(skb->data + i), packet[i]);
                                rc = 1;
                                break;
                        }
@@ -1004,7 +1001,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
                x++;
        }
 
-      clean_up:
+clean_up:
        *data1 = rc;
        pcnet32_purge_tx_ring(dev);
 
@@ -1015,29 +1012,28 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
        a->write_bcr(ioaddr, 32, (x & ~0x0002));
 
        if (netif_running(dev)) {
-               spin_unlock_irqrestore(&lp->lock, flags);
-               pcnet32_open(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);
        }
+       spin_unlock_irqrestore(&lp->lock, flags);
 
-       return (rc);
+       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;
        int i;
 
        spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
+       for (i = 4; i < 8; i++)
                a->write_bcr(ioaddr, i, a->read_bcr(ioaddr, i) ^ 0x4000);
-       }
        spin_unlock_irqrestore(&lp->lock, flags);
 
        mod_timer(&lp->blink_timer, PCNET32_BLINK_TIMEOUT);
@@ -1045,7 +1041,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;
@@ -1059,14 +1055,14 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)
 
        /* Save the current value of the bcrs */
        spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
+       for (i = 4; i < 8; i++)
                regs[i - 4] = a->read_bcr(ioaddr, i);
-       }
        spin_unlock_irqrestore(&lp->lock, flags);
 
        mod_timer(&lp->blink_timer, jiffies);
        set_current_state(TASK_INTERRUPTIBLE);
 
+       /* AV: the limit here makes no sense whatsoever */
        if ((!data) || (data > (u32) (MAX_SCHEDULE_TIMEOUT / HZ)))
                data = (u32) (MAX_SCHEDULE_TIMEOUT / HZ);
 
@@ -1075,9 +1071,8 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data)
 
        /* Restore the original value of the bcrs */
        spin_lock_irqsave(&lp->lock, flags);
-       for (i = 4; i < 8; i++) {
+       for (i = 4; i < 8; i++)
                a->write_bcr(ioaddr, i, regs[i - 4]);
-       }
        spin_unlock_irqrestore(&lp->lock, flags);
 
        return 0;
@@ -1090,7 +1085,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;
@@ -1114,10 +1109,8 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
                spin_lock_irqsave(&lp->lock, *flags);
                ticks++;
                if (ticks > 200) {
-                       if (netif_msg_hw(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Error getting into suspend!\n",
-                                      dev->name);
+                       netif_printk(lp, hw, KERN_DEBUG, dev,
+                                    "Error getting into suspend!\n");
                        return 0;
                }
        }
@@ -1146,123 +1139,113 @@ static void pcnet32_rx_entry(struct net_device *dev,
                 * 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. */
+                       dev->stats.rx_errors++; /* end of a packet. */
                if (status & 0x20)
-                       lp->stats.rx_frame_errors++;
+                       dev->stats.rx_frame_errors++;
                if (status & 0x10)
-                       lp->stats.rx_over_errors++;
+                       dev->stats.rx_over_errors++;
                if (status & 0x08)
-                       lp->stats.rx_crc_errors++;
+                       dev->stats.rx_crc_errors++;
                if (status & 0x04)
-                       lp->stats.rx_fifo_errors++;
+                       dev->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++;
+       if (unlikely(pkt_len > PKT_BUF_SIZE)) {
+               netif_err(lp, drv, dev, "Impossible packet size %d!\n",
+                         pkt_len);
+               dev->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++;
+               netif_err(lp, rx_err, dev, "Runt packet!\n");
+               dev->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);
+               newskb = dev_alloc_skb(PKT_BUF_SKB);
+               if (newskb) {
+                       skb_reserve(newskb, NET_IP_ALIGN);
                        skb = lp->rx_skbuff[entry];
                        pci_unmap_single(lp->pci_dev,
                                         lp->rx_dma_addr[entry],
-                                        PKT_BUF_SZ - 2,
+                                        PKT_BUF_SIZE,
                                         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,
+                                                          PKT_BUF_SIZE,
                                                           PCI_DMA_FROMDEVICE);
-                       rxp->base = le32_to_cpu(lp->rx_dma_addr[entry]);
+                       rxp->base = cpu_to_le32(lp->rx_dma_addr[entry]);
                        rx_in_place = 1;
                } else
                        skb = NULL;
-       } else {
-               skb = dev_alloc_skb(pkt_len + 2);
-       }
+       } else
+               skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
 
        if (skb == NULL) {
-               if (netif_msg_drv(lp))
-                       printk(KERN_ERR
-                              "%s: Memory squeeze, dropping packet.\n",
-                              dev->name);
-               lp->stats.rx_dropped++;
+               netif_err(lp, drv, dev, "Memory squeeze, dropping packet\n");
+               dev->stats.rx_dropped++;
                return;
        }
-       skb->dev = dev;
        if (!rx_in_place) {
-               skb_reserve(skb, 2);    /* 16 byte align */
+               skb_reserve(skb, NET_IP_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,
+                                           pkt_len,
                                            PCI_DMA_FROMDEVICE);
-               eth_copy_and_sum(skb,
+               skb_copy_to_linear_data(skb,
                                 (unsigned char *)(lp->rx_skbuff[entry]->data),
-                                pkt_len, 0);
+                                pkt_len);
                pci_dma_sync_single_for_device(lp->pci_dev,
                                               lp->rx_dma_addr[entry],
-                                              PKT_BUF_SZ - 2,
+                                              pkt_len,
                                               PCI_DMA_FROMDEVICE);
        }
-       lp->stats.rx_bytes += skb->len;
+       dev->stats.rx_bytes += skb->len;
        skb->protocol = eth_type_trans(skb, dev);
-       netif_rx(skb);
-       dev->last_rx = jiffies;
-       lp->stats.rx_packets++;
+       netif_receive_skb(skb);
+       dev->stats.rx_packets++;
        return;
 }
 
-
-static void pcnet32_rx(struct net_device *dev)
+static int pcnet32_rx(struct net_device *dev, int budget)
 {
-       struct pcnet32_private *lp = dev->priv;
+       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;
-       int boguscnt = lp->rx_ring_size / 2;
 
        /* If we own the next entry, it's a new packet. Send it up. */
-       while (boguscnt > npackets && (short)le16_to_cpu(rxp->status) >= 0) {
+       while (npackets < budget && (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);
+               rxp->buf_length = cpu_to_le16(NEG_BUF_SIZE);
                wmb();  /* Make sure owner changes after others are visible */
-               rxp->status = le16_to_cpu(0x8000);
+               rxp->status = cpu_to_le16(0x8000);
                entry = (++lp->cur_rx) & lp->rx_mod_mask;
                rxp = &lp->rx_ring[entry];
        }
 
-       return;
+       return npackets;
 }
 
-static int pcnet32_tx(struct net_device *dev, u16 csr0)
+static int pcnet32_tx(struct net_device *dev)
 {
-       struct pcnet32_private *lp = dev->priv;
+       struct pcnet32_private *lp = netdev_priv(dev);
        unsigned int dirty_tx = lp->dirty_tx;
        int delta;
        int must_restart = 0;
@@ -1279,47 +1262,39 @@ static int pcnet32_tx(struct net_device *dev, u16 csr0)
                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);
+                       dev->stats.tx_errors++;
+                       netif_err(lp, tx_err, dev,
+                                 "Tx error status=%04x err_status=%08x\n",
+                                 status, err_status);
                        if (err_status & 0x04000000)
-                               lp->stats.tx_aborted_errors++;
+                               dev->stats.tx_aborted_errors++;
                        if (err_status & 0x08000000)
-                               lp->stats.tx_carrier_errors++;
+                               dev->stats.tx_carrier_errors++;
                        if (err_status & 0x10000000)
-                               lp->stats.tx_window_errors++;
+                               dev->stats.tx_window_errors++;
 #ifndef DO_DXSUFLO
                        if (err_status & 0x40000000) {
-                               lp->stats.tx_fifo_errors++;
+                               dev->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);
+                               netif_err(lp, tx_err, dev, "Tx FIFO error!\n");
                                must_restart = 1;
                        }
 #else
                        if (err_status & 0x40000000) {
-                               lp->stats.tx_fifo_errors++;
+                               dev->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);
+                                       netif_err(lp, tx_err, dev, "Tx FIFO error!\n");
                                        must_restart = 1;
                                }
                        }
 #endif
                } else {
                        if (status & 0x1800)
-                               lp->stats.collisions++;
-                       lp->stats.tx_packets++;
+                               dev->stats.collisions++;
+                       dev->stats.tx_packets++;
                }
 
                /* We must free the original skb */
@@ -1337,11 +1312,8 @@ static int pcnet32_tx(struct net_device *dev, u16 csr0)
 
        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);
+               netif_err(lp, drv, dev, "out-of-sync dirty pointer, %d vs. %d, full=%d\n",
+                         dirty_tx, lp->cur_tx, lp->tx_full);
                dirty_tx += lp->tx_ring_size;
                delta -= lp->tx_ring_size;
        }
@@ -1358,14 +1330,53 @@ static int pcnet32_tx(struct net_device *dev, u16 csr0)
        return must_restart;
 }
 
+static int pcnet32_poll(struct napi_struct *napi, int budget)
+{
+       struct pcnet32_private *lp = container_of(napi, struct pcnet32_private, napi);
+       struct net_device *dev = lp->dev;
+       unsigned long ioaddr = dev->base_addr;
+       unsigned long flags;
+       int work_done;
+       u16 val;
+
+       work_done = pcnet32_rx(dev, budget);
+
+       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);
+
+       if (work_done < budget) {
+               spin_lock_irqsave(&lp->lock, flags);
+
+               __napi_complete(napi);
+
+               /* 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);
+
+               spin_unlock_irqrestore(&lp->lock, flags);
+       }
+       return work_done;
+}
+
 #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));
+       return (PCNET32_NUM_REGS + j) * sizeof(u16);
 }
 
 static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
@@ -1373,7 +1384,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;
@@ -1389,21 +1400,20 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
                *buff++ = inw(ioaddr + i);
 
        /* read control and status registers */
-       for (i = 0; i < 90; i++) {
+       for (i = 0; i < 90; i++)
                *buff++ = a->read_csr(ioaddr, i);
-       }
 
        *buff++ = a->read_csr(ioaddr, 112);
        *buff++ = a->read_csr(ioaddr, 114);
 
        /* read bus configuration registers */
-       for (i = 0; i < 30; i++) {
+       for (i = 0; i < 30; i++)
                *buff++ = a->read_bcr(ioaddr, i);
-       }
+
        *buff++ = 0;            /* skip bcr30 so as not to hang 79C976 */
-       for (i = 31; i < 36; i++) {
+
+       for (i = 31; i < 36; i++)
                *buff++ = a->read_bcr(ioaddr, i);
-       }
 
        /* read mii phy registers */
        if (lp->mii) {
@@ -1430,7 +1440,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,
@@ -1440,16 +1450,12 @@ static struct ethtool_ops pcnet32_ethtool_ops = {
        .get_link               = pcnet32_get_link,
        .get_ringparam          = pcnet32_get_ringparam,
        .set_ringparam          = pcnet32_set_ringparam,
-       .get_tx_csum            = ethtool_op_get_tx_csum,
-       .get_sg                 = ethtool_op_get_sg,
-       .get_tso                = ethtool_op_get_tso,
        .get_strings            = pcnet32_get_strings,
-       .self_test_count        = pcnet32_self_test_count,
        .self_test              = pcnet32_ethtool_test,
        .phys_id                = pcnet32_phys_id,
        .get_regs_len           = pcnet32_get_regs_len,
        .get_regs               = pcnet32_get_regs,
-       .get_perm_addr          = ethtool_op_get_perm_addr,
+       .get_sset_count         = pcnet32_get_sset_count,
 };
 
 /* only probes for non-PCI devices, the rest are handled by
@@ -1464,8 +1470,8 @@ static void __devinit pcnet32_probe_vlbus(unsigned int *pcnet32_portlist)
                if (request_region
                    (ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_vlbus")) {
                        /* check if there is really a pcnet chip on that ioaddr */
-                       if ((inb(ioaddr + 14) == 0x57)
-                           && (inb(ioaddr + 15) == 0x57)) {
+                       if ((inb(ioaddr + 14) == 0x57) &&
+                           (inb(ioaddr + 15) == 0x57)) {
                                pcnet32_probe1(ioaddr, 0, NULL);
                        } else {
                                release_region(ioaddr, PCNET32_TOTAL_SIZE);
@@ -1483,8 +1489,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
        err = pci_enable_device(pdev);
        if (err < 0) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "failed to enable device -- err=%d\n", err);
+                       pr_err("failed to enable device -- err=%d\n", err);
                return err;
        }
        pci_set_master(pdev);
@@ -1492,32 +1497,44 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
        ioaddr = pci_resource_start(pdev, 0);
        if (!ioaddr) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "card has no PCI IO resources, aborting\n");
+                       pr_err("card has no PCI IO resources, aborting\n");
                return -ENODEV;
        }
 
        if (!pci_dma_supported(pdev, PCNET32_DMA_MASK)) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "architecture does not support 32bit PCI busmaster DMA\n");
+                       pr_err("architecture does not support 32bit PCI busmaster DMA\n");
                return -ENODEV;
        }
-       if (request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci") ==
-           NULL) {
+       if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "io address range already allocated\n");
+                       pr_err("io address range already allocated\n");
                return -EBUSY;
        }
 
        err = pcnet32_probe1(ioaddr, 1, pdev);
-       if (err < 0) {
+       if (err < 0)
                pci_disable_device(pdev);
-       }
+
        return err;
 }
 
+static const struct net_device_ops pcnet32_netdev_ops = {
+       .ndo_open               = pcnet32_open,
+       .ndo_stop               = pcnet32_close,
+       .ndo_start_xmit         = pcnet32_start_xmit,
+       .ndo_tx_timeout         = pcnet32_tx_timeout,
+       .ndo_get_stats          = pcnet32_get_stats,
+       .ndo_set_multicast_list = pcnet32_set_multicast_list,
+       .ndo_do_ioctl           = pcnet32_ioctl,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = pcnet32_poll_controller,
+#endif
+};
+
 /* pcnet32_probe1
  *  Called from both pcnet32_probe_vlbus and pcnet_probe_pci.
  *  pdev will be NULL when called from pcnet32_probe_vlbus.
@@ -1526,7 +1543,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;
@@ -1544,21 +1560,23 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                a = &pcnet32_wio;
        } else {
                pcnet32_dwio_reset(ioaddr);
-               if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
-                   && pcnet32_dwio_check(ioaddr)) {
+               if (pcnet32_dwio_read_csr(ioaddr, 0) == 4 &&
+                   pcnet32_dwio_check(ioaddr)) {
                        a = &pcnet32_dwio;
-               } else
+               } else {
+                       if (pcnet32_debug & NETIF_MSG_PROBE)
+                               pr_err("No access methods\n");
                        goto err_release_region;
+               }
        }
 
        chip_version =
            a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16);
        if ((pcnet32_debug & NETIF_MSG_PROBE) && (pcnet32_debug & NETIF_MSG_HW))
-               printk(KERN_INFO "  PCnet chip version is %#x.\n",
-                      chip_version);
+               pr_info("  PCnet chip version is %#x\n", chip_version);
        if ((chip_version & 0xfff) != 0x003) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_INFO PFX "Unsupported chip version.\n");
+                       pr_info("Unsupported chip version\n");
                goto err_release_region;
        }
 
@@ -1611,7 +1629,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                if (cards_found < MAX_UNITS && homepna[cards_found])
                        media |= 1;     /* switch to home wiring mode */
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_DEBUG PFX "media set to %sMbit mode.\n",
+                       printk(KERN_DEBUG PFX "media set to %sMbit mode\n",
                               (media & 1) ? "1" : "10");
                a->write_bcr(ioaddr, 49, media);
                break;
@@ -1627,9 +1645,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                break;
        default:
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_INFO PFX
-                              "PCnet version %#x, no PCnet32 chip.\n",
-                              chip_version);
+                       pr_info("PCnet version %#x, no PCnet32 chip\n",
+                               chip_version);
                goto err_release_region;
        }
 
@@ -1648,17 +1665,19 @@ 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");
+                       pr_err("Memory allocation failed\n");
                ret = -ENOMEM;
                goto err_release_region;
        }
-       SET_NETDEV_DEV(dev, &pdev->dev);
+
+       if (pdev)
+               SET_NETDEV_DEV(dev, &pdev->dev);
 
        if (pcnet32_debug & NETIF_MSG_PROBE)
-               printk(KERN_INFO PFX "%s at %#3lx,", chipname, ioaddr);
+               pr_info("%s at %#3lx,", chipname, ioaddr);
 
        /* In most chips, after a chip reset, the ethernet address is read from the
         * station address PROM at the base address and programmed into the
@@ -1679,13 +1698,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
        for (i = 0; i < 6; i++)
                promaddr[i] = inb(ioaddr + i);
 
-       if (memcmp(promaddr, dev->dev_addr, 6)
-           || !is_valid_ether_addr(dev->dev_addr)) {
+       if (memcmp(promaddr, dev->dev_addr, 6) ||
+           !is_valid_ether_addr(dev->dev_addr)) {
                if (is_valid_ether_addr(promaddr)) {
                        if (pcnet32_debug & NETIF_MSG_PROBE) {
-                               printk(" warning: CSR address invalid,\n");
-                               printk(KERN_INFO
-                                      "    using instead PROM address of");
+                               pr_cont(" warning: CSR address invalid,\n");
+                               pr_info("    using instead PROM address of");
                        }
                        memcpy(dev->dev_addr, promaddr, 6);
                }
@@ -1694,70 +1712,66 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 
        /* if the ethernet address is not valid, force to 00:00:00:00:00:00 */
        if (!is_valid_ether_addr(dev->perm_addr))
-               memset(dev->dev_addr, 0, sizeof(dev->dev_addr));
+               memset(dev->dev_addr, 0, ETH_ALEN);
 
        if (pcnet32_debug & NETIF_MSG_PROBE) {
-               for (i = 0; i < 6; i++)
-                       printk(" %2.2x", dev->dev_addr[i]);
+               pr_cont(" %pM", dev->dev_addr);
 
                /* Version 0x2623 and 0x2624 */
                if (((chip_version + 1) & 0xfffe) == 0x2624) {
                        i = a->read_csr(ioaddr, 80) & 0x0C00;   /* Check tx_start_pt */
-                       printk("\n" KERN_INFO "    tx_start_pt(0x%04x):", i);
+                       pr_info("    tx_start_pt(0x%04x):", i);
                        switch (i >> 10) {
                        case 0:
-                               printk("  20 bytes,");
+                               pr_cont("  20 bytes,");
                                break;
                        case 1:
-                               printk("  64 bytes,");
+                               pr_cont("  64 bytes,");
                                break;
                        case 2:
-                               printk(" 128 bytes,");
+                               pr_cont(" 128 bytes,");
                                break;
                        case 3:
-                               printk("~220 bytes,");
+                               pr_cont("~220 bytes,");
                                break;
                        }
                        i = a->read_bcr(ioaddr, 18);    /* Check Burst/Bus control */
-                       printk(" BCR18(%x):", i & 0xffff);
+                       pr_cont(" BCR18(%x):", i & 0xffff);
                        if (i & (1 << 5))
-                               printk("BurstWrEn ");
+                               pr_cont("BurstWrEn ");
                        if (i & (1 << 6))
-                               printk("BurstRdEn ");
+                               pr_cont("BurstRdEn ");
                        if (i & (1 << 7))
-                               printk("DWordIO ");
+                               pr_cont("DWordIO ");
                        if (i & (1 << 11))
-                               printk("NoUFlow ");
+                               pr_cont("NoUFlow ");
                        i = a->read_bcr(ioaddr, 25);
-                       printk("\n" KERN_INFO "    SRAMSIZE=0x%04x,", i << 8);
+                       pr_info("    SRAMSIZE=0x%04x,", i << 8);
                        i = a->read_bcr(ioaddr, 26);
-                       printk(" SRAM_BND=0x%04x,", i << 8);
+                       pr_cont(" SRAM_BND=0x%04x,", i << 8);
                        i = a->read_bcr(ioaddr, 27);
                        if (i & (1 << 14))
-                               printk("LowLatRx");
+                               pr_cont("LowLatRx");
                }
        }
 
        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) {
+       lp->init_block = pci_alloc_consistent(pdev, sizeof(*lp->init_block),
+                                             &lp->init_dma_addr);
+       if (!lp->init_block) {
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX
-                              "Consistent memory allocation failed.\n");
+                       pr_err("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;
 
+       lp->dev = dev;
+
        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 */
@@ -1773,8 +1787,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
        lp->mii = mii;
        lp->chip_version = chip_version;
        lp->msg_enable = pcnet32_debug;
-       if ((cards_found >= MAX_UNITS)
-           || (options[cards_found] > sizeof(options_mapping)))
+       if ((cards_found >= MAX_UNITS) ||
+           (options[cards_found] >= sizeof(options_mapping)))
                lp->options = PCNET32_PORT_ASEL;
        else
                lp->options = options_mapping[options[cards_found]];
@@ -1782,16 +1796,15 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
        lp->mii_if.mdio_read = mdio_read;
        lp->mii_if.mdio_write = mdio_write;
 
+       /* napi.weight is used in both the napi and non-napi cases */
+       lp->napi.weight = lp->rx_ring_size / 2;
+
+       netif_napi_add(dev, &lp->napi, pcnet32_poll, lp->rx_ring_size / 2);
+
        if (fdx && !(lp->options & PCNET32_PORT_ASEL) &&
            ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
                lp->options |= PCNET32_PORT_FD;
 
-       if (!a) {
-               if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(KERN_ERR PFX "No access methods\n");
-               ret = -ENODEV;
-               goto err_free_consistent;
-       }
        lp->a = *a;
 
        /* prior to register_netdev, dev->name is not yet correct */
@@ -1800,32 +1813,30 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                goto err_free_ring;
        }
        /* detect special T1/E1 WAN card by checking for MAC address */
-       if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0
-           && dev->dev_addr[2] == 0x75)
+       if (dev->dev_addr[0] == 0x00 && dev->dev_addr[1] == 0xe0 &&
+           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 =
-           le16_to_cpu(lp->tx_len_bits | lp->rx_len_bits);
+       lp->init_block->mode = cpu_to_le16(0x0003);     /* Disable Rx and Tx. */
+       lp->init_block->tlen_rlen =
+           cpu_to_le16(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 = cpu_to_le32(lp->rx_ring_dma_addr);
+       lp->init_block->tx_ring = cpu_to_le32(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;
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(" assigned IRQ %d.\n", dev->irq);
+                       pr_cont(" assigned IRQ %d\n", dev->irq);
        } else {
                unsigned long irq_mask = probe_irq_on();
 
@@ -1841,12 +1852,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                dev->irq = probe_irq_off(irq_mask);
                if (!dev->irq) {
                        if (pcnet32_debug & NETIF_MSG_PROBE)
-                               printk(", failed to detect IRQ line.\n");
+                               pr_cont(", failed to detect IRQ line\n");
                        ret = -ENODEV;
                        goto err_free_ring;
                }
                if (pcnet32_debug & NETIF_MSG_PROBE)
-                       printk(", probed IRQ %d.\n", dev->irq);
+                       pr_cont(", probed IRQ %d\n", dev->irq);
        }
 
        /* Set the mii phy_id so that we can query the link state */
@@ -1870,14 +1881,12 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                        lp->phymask |= (1 << i);
                        lp->mii_if.phy_id = i;
                        if (pcnet32_debug & NETIF_MSG_PROBE)
-                               printk(KERN_INFO PFX
-                                      "Found PHY %04x:%04x at address %d.\n",
-                                      id1, id2, i);
+                               pr_info("Found PHY %04x:%04x at address %d\n",
+                                       id1, id2, i);
                }
                lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
-               if (lp->phycount > 1) {
+               if (lp->phycount > 1)
                        lp->options |= PCNET32_PORT_MII;
-               }
        }
 
        init_timer(&lp->watchdog_timer);
@@ -1885,20 +1894,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
        lp->watchdog_timer.function = (void *)&pcnet32_watchdog;
 
        /* The PCNET32-specific entries in the device structure. */
-       dev->open = &pcnet32_open;
-       dev->hard_start_xmit = &pcnet32_start_xmit;
-       dev->stop = &pcnet32_close;
-       dev->get_stats = &pcnet32_get_stats;
-       dev->set_multicast_list = &pcnet32_set_multicast_list;
-       dev->do_ioctl = &pcnet32_ioctl;
+       dev->netdev_ops = &pcnet32_netdev_ops;
        dev->ethtool_ops = &pcnet32_ethtool_ops;
-       dev->tx_timeout = pcnet32_tx_timeout;
        dev->watchdog_timeo = (5 * HZ);
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = pcnet32_poll_controller;
-#endif
-
        /* Fill in the generic fields of the device structure. */
        if (register_netdev(dev))
                goto err_free_ring;
@@ -1911,7 +1910,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
        }
 
        if (pcnet32_debug & NETIF_MSG_PROBE)
-               printk(KERN_INFO "%s: registered as %s\n", dev->name, lp->name);
+               pr_info("%s: registered as %s\n", dev->name, lp->name);
        cards_found++;
 
        /* enable LED writes */
@@ -1919,31 +1918,28 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 
        return 0;
 
-      err_free_ring:
+err_free_ring:
        pcnet32_free_ring(dev);
-      err_free_consistent:
-       pci_free_consistent(lp->pci_dev, sizeof(*lp), lp, lp->dma_addr);
-      err_free_netdev:
+       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:
+err_release_region:
        release_region(ioaddr, PCNET32_TOTAL_SIZE);
        return ret;
 }
 
 /* if any allocation fails, caller must also call pcnet32_free_ring */
-static int pcnet32_alloc_ring(struct net_device *dev, char *name)
+static int pcnet32_alloc_ring(struct net_device *dev, const 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) *
                                           lp->tx_ring_size,
                                           &lp->tx_ring_dma_addr);
        if (lp->tx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Consistent memory allocation failed.\n",
-                              name);
+               netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                return -ENOMEM;
        }
 
@@ -1952,46 +1948,35 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)
                                           lp->rx_ring_size,
                                           &lp->rx_ring_dma_addr);
        if (lp->rx_ring == NULL) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Consistent memory allocation failed.\n",
-                              name);
+               netif_err(lp, drv, dev, "Consistent memory allocation failed\n");
                return -ENOMEM;
        }
 
        lp->tx_dma_addr = kcalloc(lp->tx_ring_size, sizeof(dma_addr_t),
                                  GFP_ATOMIC);
        if (!lp->tx_dma_addr) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                return -ENOMEM;
        }
 
        lp->rx_dma_addr = kcalloc(lp->rx_ring_size, sizeof(dma_addr_t),
                                  GFP_ATOMIC);
        if (!lp->rx_dma_addr) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                return -ENOMEM;
        }
 
        lp->tx_skbuff = kcalloc(lp->tx_ring_size, sizeof(struct sk_buff *),
                                GFP_ATOMIC);
        if (!lp->tx_skbuff) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                return -ENOMEM;
        }
 
        lp->rx_skbuff = kcalloc(lp->rx_ring_size, sizeof(struct sk_buff *),
                                GFP_ATOMIC);
        if (!lp->rx_skbuff) {
-               if (netif_msg_drv(lp))
-                       printk("\n" KERN_ERR PFX
-                              "%s: Memory allocation failed.\n", name);
+               netif_err(lp, drv, dev, "Memory allocation failed\n");
                return -ENOMEM;
        }
 
@@ -2000,7 +1985,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;
@@ -2033,14 +2018,15 @@ 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);
+       struct pci_dev *pdev = lp->pci_dev;
        unsigned long ioaddr = dev->base_addr;
        u16 val;
        int i;
        int rc;
        unsigned long flags;
 
-       if (request_irq(dev->irq, &pcnet32_interrupt,
+       if (request_irq(dev->irq, pcnet32_interrupt,
                        lp->shared_irq ? IRQF_SHARED : 0, dev->name,
                        (void *)dev)) {
                return -EAGAIN;
@@ -2059,13 +2045,11 @@ static int pcnet32_open(struct net_device *dev)
        /* switch pcnet32 to 32bit mode */
        lp->a.write_bcr(ioaddr, 20, 2);
 
-       if (netif_msg_ifup(lp))
-               printk(KERN_DEBUG
-                      "%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)));
+       netif_printk(lp, ifup, KERN_DEBUG, dev,
+                    "%s() irq %d tx/rx rings %#x/%#x init %#x\n",
+                    __func__, dev->irq, (u32) (lp->tx_ring_dma_addr),
+                    (u32) (lp->rx_ring_dma_addr),
+                    (u32) (lp->init_dma_addr));
 
        /* set/reset autoselect bit */
        val = lp->a.read_bcr(ioaddr, 2) & ~2;
@@ -2095,15 +2079,13 @@ static int pcnet32_open(struct net_device *dev)
        lp->a.write_csr(ioaddr, 124, val);
 
        /* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate */
-       if (lp->pci_dev->subsystem_vendor == PCI_VENDOR_ID_AT &&
-           (lp->pci_dev->subsystem_device == PCI_SUBDEVICE_ID_AT_2700FX ||
-            lp->pci_dev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) {
+       if (pdev && pdev->subsystem_vendor == PCI_VENDOR_ID_AT &&
+           (pdev->subsystem_device == PCI_SUBDEVICE_ID_AT_2700FX ||
+            pdev->subsystem_device == PCI_SUBDEVICE_ID_AT_2701FX)) {
                if (lp->options & PCNET32_PORT_ASEL) {
                        lp->options = PCNET32_PORT_FD | PCNET32_PORT_100;
-                       if (netif_msg_link(lp))
-                               printk(KERN_DEBUG
-                                      "%s: Setting 100Mb-Full Duplex.\n",
-                                      dev->name);
+                       netif_printk(lp, link, KERN_DEBUG, dev,
+                                    "Setting 100Mb-Full Duplex\n");
                }
        }
        if (lp->phycount < 2) {
@@ -2191,9 +2173,7 @@ static int pcnet32_open(struct net_device *dev)
                        }
                }
                lp->mii_if.phy_id = first_phy;
-               if (netif_msg_link(lp))
-                       printk(KERN_INFO "%s: Using PHY number %d.\n",
-                              dev->name, first_phy);
+               netif_info(lp, link, dev, "Using PHY number %d\n", first_phy);
        }
 
 #ifdef DO_DXSUFLO
@@ -2204,8 +2184,8 @@ static int pcnet32_open(struct net_device *dev)
        }
 #endif
 
-       lp->init_block.mode =
-           le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
+       lp->init_block->mode =
+           cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
        pcnet32_load_multicast(dev);
 
        if (pcnet32_init_ring(dev)) {
@@ -2213,13 +2193,11 @@ static int pcnet32_open(struct net_device *dev)
                goto err_free_ring;
        }
 
+       napi_enable(&lp->napi);
+
        /* 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, CSR4, 0x0915);  /* auto tx pad */
        lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
@@ -2229,7 +2207,7 @@ static int pcnet32_open(struct net_device *dev)
        if (lp->chip_version >= PCNET32_79C970A) {
                /* Print the link status and start the watchdog */
                pcnet32_check_media(dev, 1);
-               mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT);
+               mod_timer(&lp->watchdog_timer, PCNET32_WATCHDOG_TIMEOUT);
        }
 
        i = 0;
@@ -2242,19 +2220,17 @@ static int pcnet32_open(struct net_device *dev)
         */
        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, CSR0));
+       netif_printk(lp, ifup, KERN_DEBUG, dev,
+                    "pcnet32 open after %d ticks, init block %#x csr0 %4.4x\n",
+                    i,
+                    (u32) (lp->init_dma_addr),
+                    lp->a.read_csr(ioaddr, CSR0));
 
        spin_unlock_irqrestore(&lp->lock, flags);
 
        return 0;               /* Always succeed */
 
-      err_free_ring:
+err_free_ring:
        /* free any allocated skbuffs */
        pcnet32_purge_rx_ring(dev);
 
@@ -2264,7 +2240,7 @@ static int pcnet32_open(struct net_device *dev)
         */
        lp->a.write_bcr(ioaddr, 20, 4);
 
-      err_free_irq:
+err_free_irq:
        spin_unlock_irqrestore(&lp->lock, flags);
        free_irq(dev->irq, dev);
        return rc;
@@ -2285,7 +2261,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++) {
@@ -2305,7 +2281,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;
@@ -2315,28 +2291,26 @@ static int pcnet32_init_ring(struct net_device *dev)
        for (i = 0; i < lp->rx_ring_size; i++) {
                struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
                if (rx_skbuff == NULL) {
-                       if (!
-                           (rx_skbuff = lp->rx_skbuff[i] =
-                            dev_alloc_skb(PKT_BUF_SZ))) {
-                               /* there is not much, we can do at this point */
-                               if (netif_msg_drv(lp))
-                                       printk(KERN_ERR
-                                              "%s: pcnet32_init_ring dev_alloc_skb failed.\n",
-                                              dev->name);
+                       lp->rx_skbuff[i] = dev_alloc_skb(PKT_BUF_SKB);
+                       rx_skbuff = lp->rx_skbuff[i];
+                       if (!rx_skbuff) {
+                               /* there is not much we can do at this point */
+                               netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                                         __func__);
                                return -1;
                        }
-                       skb_reserve(rx_skbuff, 2);
+                       skb_reserve(rx_skbuff, NET_IP_ALIGN);
                }
 
                rmb();
                if (lp->rx_dma_addr[i] == 0)
                        lp->rx_dma_addr[i] =
                            pci_map_single(lp->pci_dev, rx_skbuff->data,
-                                          PKT_BUF_SZ - 2, PCI_DMA_FROMDEVICE);
-               lp->rx_ring[i].base = (u32) le32_to_cpu(lp->rx_dma_addr[i]);
-               lp->rx_ring[i].buf_length = le16_to_cpu(2 - PKT_BUF_SZ);
+                                          PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);
+               lp->rx_ring[i].base = cpu_to_le32(lp->rx_dma_addr[i]);
+               lp->rx_ring[i].buf_length = cpu_to_le16(NEG_BUF_SIZE);
                wmb();          /* Make sure owner changes after all others are visible */
-               lp->rx_ring[i].status = le16_to_cpu(0x8000);
+               lp->rx_ring[i].status = cpu_to_le16(0x8000);
        }
        /* The Tx buffer address is filled in as needed, but we do need to clear
         * the upper ownership bit. */
@@ -2347,12 +2321,12 @@ static int pcnet32_init_ring(struct net_device *dev)
                lp->tx_dma_addr[i] = 0;
        }
 
-       lp->init_block.tlen_rlen =
-           le16_to_cpu(lp->tx_len_bits | lp->rx_len_bits);
+       lp->init_block->tlen_rlen =
+           cpu_to_le16(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 = cpu_to_le32(lp->rx_ring_dma_addr);
+       lp->init_block->tx_ring = cpu_to_le32(lp->tx_ring_dma_addr);
        wmb();                  /* Make sure all changes are visible */
        return 0;
 }
@@ -2363,7 +2337,7 @@ 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;
 
@@ -2372,10 +2346,9 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
                if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
                        break;
 
-       if (i >= 100 && netif_msg_drv(lp))
-               printk(KERN_ERR
-                      "%s: pcnet32_restart timed out waiting for stop.\n",
-                      dev->name);
+       if (i >= 100)
+               netif_err(lp, drv, dev, "%s timed out waiting for stop\n",
+                         __func__);
 
        pcnet32_purge_tx_ring(dev);
        if (pcnet32_init_ring(dev))
@@ -2393,17 +2366,16 @@ static void pcnet32_restart(struct net_device *dev, unsigned int 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);
        /* Transmitter timeout, serious problems. */
        if (pcnet32_debug & NETIF_MSG_DRV)
-               printk(KERN_ERR
-                      "%s: transmit timed out, status %4.4x, resetting.\n",
+               pr_err("%s: transmit timed out, status %4.4x, resetting\n",
                       dev->name, lp->a.read_csr(ioaddr, CSR0));
        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
-       lp->stats.tx_errors++;
+       dev->stats.tx_errors++;
        if (netif_msg_tx_err(lp)) {
                int i;
                printk(KERN_DEBUG
@@ -2432,9 +2404,10 @@ static void pcnet32_tx_timeout(struct net_device *dev)
        spin_unlock_irqrestore(&lp->lock, flags);
 }
 
-static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t 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;
@@ -2442,11 +2415,9 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        spin_lock_irqsave(&lp->lock, flags);
 
-       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, CSR0));
-       }
+       netif_printk(lp, tx_queued, KERN_DEBUG, dev,
+                    "%s() called, csr0 %4.4x\n",
+                    __func__, lp->a.read_csr(ioaddr, CSR0));
 
        /* Default status -- will not enable Successful-TxDone
         * interrupt when that option is available to us.
@@ -2461,19 +2432,19 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* Caution: the write order is important here, set the status
         * with the "ownership" bits last. */
 
-       lp->tx_ring[entry].length = le16_to_cpu(-skb->len);
+       lp->tx_ring[entry].length = cpu_to_le16(-skb->len);
 
        lp->tx_ring[entry].misc = 0x00000000;
 
        lp->tx_skbuff[entry] = skb;
        lp->tx_dma_addr[entry] =
            pci_map_single(lp->pci_dev, skb->data, skb->len, PCI_DMA_TODEVICE);
-       lp->tx_ring[entry].base = (u32) le32_to_cpu(lp->tx_dma_addr[entry]);
+       lp->tx_ring[entry].base = cpu_to_le32(lp->tx_dma_addr[entry]);
        wmb();                  /* Make sure owner changes after all others are visible */
-       lp->tx_ring[entry].status = le16_to_cpu(status);
+       lp->tx_ring[entry].status = cpu_to_le16(status);
 
        lp->cur_tx++;
-       lp->stats.tx_bytes += skb->len;
+       dev->stats.tx_bytes += skb->len;
 
        /* Trigger an immediate send poll. */
        lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
@@ -2485,57 +2456,38 @@ static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
                netif_stop_queue(dev);
        }
        spin_unlock_irqrestore(&lp->lock, flags);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 /* 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;
        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);
 
        csr0 = lp->a.read_csr(ioaddr, CSR0);
        while ((csr0 & 0x8f00) && --boguscnt >= 0) {
-               if (csr0 == 0xffff) {
+               if (csr0 == 0xffff)
                        break;  /* PCMCIA remove happened */
-               }
                /* Acknowledge all of the current interrupt sources ASAP. */
                lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
 
-               must_restart = 0;
-
-               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, CSR0));
-
-               if (csr0 & 0x0400)      /* Rx interrupt */
-                       pcnet32_rx(dev);
-
-               if (csr0 & 0x0200) {    /* Tx-done interrupt */
-                       must_restart = pcnet32_tx(dev, csr0);
-               }
+               netif_printk(lp, intr, KERN_DEBUG, dev,
+                            "interrupt  csr0=%#2.2x new csr=%#2.2x\n",
+                            csr0, lp->a.read_csr(ioaddr, CSR0));
 
                /* Log misc errors. */
                if (csr0 & 0x4000)
-                       lp->stats.tx_errors++;  /* Tx babble. */
+                       dev->stats.tx_errors++; /* Tx babble. */
                if (csr0 & 0x1000) {
                        /*
                         * This happens when our receive ring is full. This
@@ -2546,36 +2498,31 @@ pcnet32_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                         * 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.
+                        * interrupt sooner or later.
                         */
-                       pcnet32_rx(dev);
-                       lp->stats.rx_errors++;  /* Missed a Rx frame. */
+                       dev->stats.rx_errors++; /* Missed a Rx frame. */
                }
                if (csr0 & 0x0800) {
-                       if (netif_msg_drv(lp))
-                               printk(KERN_ERR
-                                      "%s: Bus master arbitration failure, status %4.4x.\n",
-                                      dev->name, csr0);
+                       netif_err(lp, drv, dev, "Bus master arbitration failure, status %4.4x\n",
+                                 csr0);
                        /* unlike for the lance, there is no restart needed */
                }
-
-               if (must_restart) {
-                       /* 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);
+               if (napi_schedule_prep(&lp->napi)) {
+                       u16 val;
+                       /* set interrupt masks */
+                       val = lp->a.read_csr(ioaddr, CSR3);
+                       val |= 0x5f00;
+                       lp->a.write_csr(ioaddr, CSR3, val);
+
+                       __napi_schedule(&lp->napi);
+                       break;
                }
                csr0 = lp->a.read_csr(ioaddr, CSR0);
        }
 
-       /* Set interrupt enable. */
-       lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
-
-       if (netif_msg_intr(lp))
-               printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
+       netif_printk(lp, intr, KERN_DEBUG, dev,
+                    "exiting interrupt, csr0=%#4.4x\n",
+                    lp->a.read_csr(ioaddr, CSR0));
 
        spin_unlock(&lp->lock);
 
@@ -2585,21 +2532,21 @@ pcnet32_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 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);
 
        netif_stop_queue(dev);
+       napi_disable(&lp->napi);
 
        spin_lock_irqsave(&lp->lock, flags);
 
-       lp->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
+       dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
 
-       if (netif_msg_ifdown(lp))
-               printk(KERN_DEBUG
-                      "%s: Shutting down ethercard, status was %2.2x.\n",
-                      dev->name, lp->a.read_csr(ioaddr, CSR0));
+       netif_printk(lp, ifdown, KERN_DEBUG, dev,
+                    "Shutting down ethercard, status was %2.2x\n",
+                    lp->a.read_csr(ioaddr, CSR0));
 
        /* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
        lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
@@ -2626,24 +2573,24 @@ 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;
        unsigned long flags;
 
        spin_lock_irqsave(&lp->lock, flags);
-       lp->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
+       dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
        spin_unlock_irqrestore(&lp->lock, flags);
 
-       return &lp->stats;
+       return &dev->stats;
 }
 
 /* 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;
-       volatile u16 *mcast_table = (u16 *) & ib->filter;
-       struct dev_mc_list *dmi = dev->mc_list;
+       struct pcnet32_private *lp = netdev_priv(dev);
+       volatile struct pcnet32_init_block *ib = lp->init_block;
+       volatile __le16 *mcast_table = (__le16 *)ib->filter;
+       struct dev_mc_list *dmi;
        unsigned long ioaddr = dev->base_addr;
        char *addrs;
        int i;
@@ -2651,8 +2598,8 @@ static void pcnet32_load_multicast(struct net_device *dev)
 
        /* set all multicast bits */
        if (dev->flags & IFF_ALLMULTI) {
-               ib->filter[0] = 0xffffffff;
-               ib->filter[1] = 0xffffffff;
+               ib->filter[0] = cpu_to_le32(~0U);
+               ib->filter[1] = cpu_to_le32(~0U);
                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
@@ -2664,9 +2611,8 @@ static void pcnet32_load_multicast(struct net_device *dev)
        ib->filter[1] = 0;
 
        /* Add addresses */
-       for (i = 0; i < dev->mc_count; i++) {
+       netdev_for_each_mc_addr(dmi, dev) {
                addrs = dmi->dmi_addr;
-               dmi = dmi->next;
 
                /* multicast address? */
                if (!(*addrs & 1))
@@ -2674,9 +2620,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
 
                crc = ether_crc_le(6, addrs);
                crc = crc >> 26;
-               mcast_table[crc >> 4] =
-                   le16_to_cpu(le16_to_cpu(mcast_table[crc >> 4]) |
-                               (1 << (crc & 0xf)));
+               mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
        }
        for (i = 0; i < 4; i++)
                lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
@@ -2690,7 +2634,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);
@@ -2698,16 +2642,14 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
        csr15 = lp->a.read_csr(ioaddr, CSR15);
        if (dev->flags & IFF_PROMISC) {
                /* Log any net taps. */
-               if (netif_msg_hw(lp))
-                       printk(KERN_INFO "%s: Promiscuous mode enabled.\n",
-                              dev->name);
-               lp->init_block.mode =
-                   le16_to_cpu(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
+               netif_info(lp, hw, dev, "Promiscuous mode enabled\n");
+               lp->init_block->mode =
+                   cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
                                7);
                lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
        } else {
-               lp->init_block.mode =
-                   le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
+               lp->init_block->mode =
+                   cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
                lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
                pcnet32_load_multicast(dev);
        }
@@ -2729,7 +2671,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;
 
@@ -2745,7 +2687,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)
@@ -2757,7 +2699,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;
 
@@ -2775,7 +2717,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;
@@ -2787,10 +2729,8 @@ static int pcnet32_check_otherphy(struct net_device *dev)
                        mii.phy_id = i;
                        if (mii_link_ok(&mii)) {
                                /* found PHY with active link */
-                               if (netif_msg_link(lp))
-                                       printk(KERN_INFO
-                                              "%s: Using PHY number %d.\n",
-                                              dev->name, i);
+                               netif_info(lp, link, dev, "Using PHY number %d\n",
+                                          i);
 
                                /* isolate inactive phy */
                                bmcr =
@@ -2822,7 +2762,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;
@@ -2836,8 +2776,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
        if (!curr_link) {
                if (prev_link || verbose) {
                        netif_carrier_off(dev);
-                       if (netif_msg_link(lp))
-                               printk(KERN_INFO "%s: link down\n", dev->name);
+                       netif_info(lp, link, dev, "link down\n");
                }
                if (lp->phycount > 1) {
                        curr_link = pcnet32_check_otherphy(dev);
@@ -2849,12 +2788,11 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
                        if (netif_msg_link(lp)) {
                                struct ethtool_cmd ecmd;
                                mii_ethtool_gset(&lp->mii_if, &ecmd);
-                               printk(KERN_INFO
-                                      "%s: link up, %sMbps, %s-duplex\n",
-                                      dev->name,
-                                      (ecmd.speed == SPEED_100) ? "100" : "10",
-                                      (ecmd.duplex ==
-                                       DUPLEX_FULL) ? "full" : "half");
+                               netdev_info(dev, "link up, %sMbps, %s-duplex\n",
+                                           (ecmd.speed == SPEED_100)
+                                           ? "100" : "10",
+                                           (ecmd.duplex == DUPLEX_FULL)
+                                           ? "full" : "half");
                        }
                        bcr9 = lp->a.read_bcr(dev->base_addr, 9);
                        if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
@@ -2865,8 +2803,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
                                lp->a.write_bcr(dev->base_addr, 9, bcr9);
                        }
                } else {
-                       if (netif_msg_link(lp))
-                               printk(KERN_INFO "%s: link up\n", dev->name);
+                       netif_info(lp, link, dev, "link up\n");
                }
        }
 }
@@ -2878,7 +2815,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 */
@@ -2886,7 +2823,34 @@ static void pcnet32_watchdog(struct net_device *dev)
        pcnet32_check_media(dev, 0);
        spin_unlock_irqrestore(&lp->lock, flags);
 
-       mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT);
+       mod_timer(&lp->watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT));
+}
+
+static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+
+       if (netif_running(dev)) {
+               netif_device_detach(dev);
+               pcnet32_close(dev);
+       }
+       pci_save_state(pdev);
+       pci_set_power_state(pdev, pci_choose_state(pdev, state));
+       return 0;
+}
+
+static int pcnet32_pm_resume(struct pci_dev *pdev)
+{
+       struct net_device *dev = pci_get_drvdata(pdev);
+
+       pci_set_power_state(pdev, PCI_D0);
+       pci_restore_state(pdev);
+
+       if (netif_running(dev)) {
+               pcnet32_open(dev);
+               netif_device_attach(dev);
+       }
+       return 0;
 }
 
 static void __devexit pcnet32_remove_one(struct pci_dev *pdev)
@@ -2894,12 +2858,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);
@@ -2911,6 +2876,8 @@ static struct pci_driver pcnet32_driver = {
        .probe = pcnet32_probe_pci,
        .remove = __devexit_p(pcnet32_remove_one),
        .id_table = pcnet32_pci_tbl,
+       .suspend = pcnet32_pm_suspend,
+       .resume = pcnet32_pm_resume,
 };
 
 /* An additional parameter that may be passed in... */
@@ -2948,7 +2915,7 @@ MODULE_LICENSE("GPL");
 
 static int __init pcnet32_init_module(void)
 {
-       printk(KERN_INFO "%s", version);
+       pr_info("%s", version);
 
        pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);
 
@@ -2964,7 +2931,7 @@ static int __init pcnet32_init_module(void)
                pcnet32_probe_vlbus(pcnet32_portlist);
 
        if (cards_found && (pcnet32_debug & NETIF_MSG_PROBE))
-               printk(KERN_INFO PFX "%d cards_found.\n", cards_found);
+               pr_info("%d cards_found\n", cards_found);
 
        return (pcnet32_have_pci + cards_found) ? 0 : -ENODEV;
 }
@@ -2974,12 +2941,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;
        }