1 files changed, 22 insertions, 23 deletions

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index f37170cc1a3..dc5e38aefca 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
 
-  Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2006 Intel Corporation. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the Free
@@ -138,7 +138,6 @@
  *      - Stratus87247: protect MDI control register manipulations
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -159,10 +158,10 @@
 
 
 #define DRV_NAME                "e100"
-#define DRV_EXT         "-NAPI"
-#define DRV_VERSION             "3.5.10-k2"DRV_EXT
+#define DRV_EXT                 "-NAPI"
+#define DRV_VERSION             "3.5.16-k2"DRV_EXT
 #define DRV_DESCRIPTION         "Intel(R) PRO/100 Network Driver"
-#define DRV_COPYRIGHT           "Copyright(c) 1999-2005 Intel Corporation"
+#define DRV_COPYRIGHT           "Copyright(c) 1999-2006 Intel Corporation"
 #define PFX                     DRV_NAME ": "
 
 #define E100_WATCHDOG_PERIOD    (2 * HZ)
@@ -174,8 +173,11 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
 static int debug = 3;
+static int eeprom_bad_csum_allow = 0;
 module_param(debug, int, 0);
+module_param(eeprom_bad_csum_allow, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
+MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");
 #define DPRINTK(nlevel, klevel, fmt, args...) \
         (void)((NETIF_MSG_##nlevel & nic->msg_enable) && \
         printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \
@@ -757,7 +759,8 @@ static int e100_eeprom_load(struct nic *nic)
         checksum = le16_to_cpu(0xBABA - checksum);
         if(checksum != nic->eeprom[nic->eeprom_wc - 1]) {
                 DPRINTK(PROBE, ERR, "EEPROM corrupted\n");
-                return -EAGAIN;
+                if (!eeprom_bad_csum_allow)
+                        return -EAGAIN;
         }
 
         return 0;
@@ -1392,15 +1395,11 @@ static int e100_phy_init(struct nic *nic)
         }
 
         if((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&
-           (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000))) {
-                /* enable/disable MDI/MDI-X auto-switching.
-                   MDI/MDI-X auto-switching is disabled for 82551ER/QM chips */
-                if((nic->mac == mac_82551_E) || (nic->mac == mac_82551_F) ||
-                   (nic->mac == mac_82551_10) || (nic->mii.force_media) ||
-                   !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))
-                        mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, 0);
-                else
-                        mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, NCONFIG_AUTO_SWITCH);
+           (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&
+                !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {
+                /* enable/disable MDI/MDI-X auto-switching. */
+                mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,
+                                nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);
         }
 
         return 0;
@@ -1764,11 +1763,10 @@ static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
 #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
 static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
 {
-        if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + NET_IP_ALIGN)))
+        if(!(rx->skb = netdev_alloc_skb(nic->netdev, RFD_BUF_LEN + NET_IP_ALIGN)))
                 return -ENOMEM;
 
         /* Align, init, and map the RFD. */
-        rx->skb->dev = nic->netdev;
         skb_reserve(rx->skb, NET_IP_ALIGN);
         memcpy(rx->skb->data, &nic->blank_rfd, sizeof(struct rfd));
         rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,
@@ -2064,7 +2062,7 @@ static int e100_up(struct nic *nic)
         e100_set_multicast_list(nic->netdev);
         e100_start_receiver(nic, NULL);
         mod_timer(&nic->watchdog, jiffies);
-        if((err = request_irq(nic->pdev->irq, e100_intr, SA_SHIRQ,
+        if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
                 nic->netdev->name, nic->netdev)))
                 goto err_no_irq;
         netif_wake_queue(nic->netdev);
@@ -2144,7 +2142,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
 
         e100_start_receiver(nic, NULL);
 
-        if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) {
+        if(!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
                 err = -ENOMEM;
                 goto err_loopback_none;
         }
@@ -2479,7 +2477,7 @@ static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
         }
 }
 
-static struct ethtool_ops e100_ethtool_ops = {
+static const struct ethtool_ops e100_ethtool_ops = {
         .get_settings           = e100_get_settings,
         .set_settings           = e100_set_settings,
         .get_drvinfo            = e100_get_drvinfo,
@@ -2678,9 +2676,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 goto err_out_free;
         }
 
-        DPRINTK(PROBE, INFO, "addr 0x%lx, irq %d, "
+        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, "
                 "MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
-                pci_resource_start(pdev, 0), pdev->irq,
+                (unsigned long long)pci_resource_start(pdev, 0), pdev->irq,
                 netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
                 netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
 
@@ -2796,6 +2794,7 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel
         /* Detach; put netif into state similar to hotplug unplug. */
         netif_poll_enable(netdev);
         netif_device_detach(netdev);
+        pci_disable_device(pdev);
 
         /* Request a slot reset. */
         return PCI_ERS_RESULT_NEED_RESET;
@@ -2874,7 +2873,7 @@ static int __init e100_init_module(void)
                 printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
                 printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT);
         }
-        return pci_module_init(&e100_driver);
+        return pci_register_driver(&e100_driver);
 }
 
 static void __exit e100_cleanup_module(void)