Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 27 insertions, 33 deletions

diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 8da87383fb39..16249e9b6b95 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -51,10 +51,10 @@
 
 #define ATL2_DRV_VERSION "2.2.3"
 
-static char atl2_driver_name[] = "atl2";
+static const char atl2_driver_name[] = "atl2";
 static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";
-static char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";
-static char atl2_driver_version[] = ATL2_DRV_VERSION;
+static const char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";
+static const char atl2_driver_version[] = ATL2_DRV_VERSION;
 
 MODULE_AUTHOR("Atheros Corporation <xiong.huang@atheros.com>, Chris Snook <csnook@redhat.com>");
 MODULE_DESCRIPTION("Atheros Fast Ethernet Network Driver");
@@ -93,8 +93,8 @@ static int __devinit atl2_sw_init(struct atl2_adapter *adapter)
         hw->device_id = pdev->device;
         hw->subsystem_vendor_id = pdev->subsystem_vendor;
         hw->subsystem_id = pdev->subsystem_device;
+        hw->revision_id  = pdev->revision;
 
-        pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id);
         pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
 
         adapter->wol = 0;
@@ -870,7 +870,7 @@ static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,
                 offset = ((u32)(skb->len-copy_len + 3) & ~3);
         }
 #ifdef NETIF_F_HW_VLAN_TX
-        if (adapter->vlgrp && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 u16 vlan_tag = vlan_tx_tag_get(skb);
                 vlan_tag = (vlan_tag << 4) |
                         (vlan_tag >> 13) |
@@ -1411,9 +1411,8 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
 
         err = -EIO;
 
-#ifdef NETIF_F_HW_VLAN_TX
+        netdev->hw_features = NETIF_F_SG;
         netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
-#endif
 
         /* Init PHY as early as possible due to power saving issue  */
         atl2_phy_init(&adapter->hw);
@@ -1444,11 +1443,11 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
         atl2_check_options(adapter);
 
         init_timer(&adapter->watchdog_timer);
-        adapter->watchdog_timer.function = &atl2_watchdog;
+        adapter->watchdog_timer.function = atl2_watchdog;
         adapter->watchdog_timer.data = (unsigned long) adapter;
 
         init_timer(&adapter->phy_config_timer);
-        adapter->phy_config_timer.function = &atl2_phy_config;
+        adapter->phy_config_timer.function = atl2_phy_config;
         adapter->phy_config_timer.data = (unsigned long) adapter;
 
         INIT_WORK(&adapter->reset_task, atl2_reset_task);
@@ -1504,8 +1503,8 @@ static void __devexit atl2_remove(struct pci_dev *pdev)
 
         del_timer_sync(&adapter->watchdog_timer);
         del_timer_sync(&adapter->phy_config_timer);
-
-        flush_scheduled_work();
+        cancel_work_sync(&adapter->reset_task);
+        cancel_work_sync(&adapter->link_chg_task);
 
         unregister_netdev(netdev);
 
@@ -1701,7 +1700,7 @@ static struct pci_driver atl2_driver = {
         .id_table = atl2_pci_tbl,
         .probe    = atl2_probe,
         .remove   = __devexit_p(atl2_remove),
-        /* Power Managment Hooks */
+        /* Power Management Hooks */
         .suspend  = atl2_suspend,
 #ifdef CONFIG_PM
         .resume   = atl2_resume,
@@ -1770,13 +1769,13 @@ static int atl2_get_settings(struct net_device *netdev,
         ecmd->transceiver = XCVR_INTERNAL;
 
         if (adapter->link_speed != SPEED_0) {
-                ecmd->speed = adapter->link_speed;
+                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                 if (adapter->link_duplex == FULL_DUPLEX)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -1840,11 +1839,6 @@ static int atl2_set_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 atl2_get_tx_csum(struct net_device *netdev)
-{
-        return (netdev->features & NETIF_F_HW_CSUM) != 0;
-}
-
 static u32 atl2_get_msglevel(struct net_device *netdev)
 {
         return 0;
@@ -1996,13 +1990,15 @@ static int atl2_set_eeprom(struct net_device *netdev,
         if (!eeprom_buff)
                 return -ENOMEM;
 
-        ptr = (u32 *)eeprom_buff;
+        ptr = eeprom_buff;
 
         if (eeprom->offset & 3) {
                 /* need read/modify/write of first changed EEPROM word */
                 /* only the second byte of the word is being modified */
-                if (!atl2_read_eeprom(hw, first_dword*4, &(eeprom_buff[0])))
-                        return -EIO;
+                if (!atl2_read_eeprom(hw, first_dword*4, &(eeprom_buff[0]))) {
+                        ret_val = -EIO;
+                        goto out;
+                }
                 ptr++;
         }
         if (((eeprom->offset + eeprom->len) & 3)) {
@@ -2011,18 +2007,22 @@ static int atl2_set_eeprom(struct net_device *netdev,
                  * only the first byte of the word is being modified
                  */
                 if (!atl2_read_eeprom(hw, last_dword * 4,
-                        &(eeprom_buff[last_dword - first_dword])))
-                        return -EIO;
+                                        &(eeprom_buff[last_dword - first_dword]))) {
+                        ret_val = -EIO;
+                        goto out;
+                }
         }
 
         /* Device's eeprom is always little-endian, word addressable */
         memcpy(ptr, bytes, eeprom->len);
 
         for (i = 0; i < last_dword - first_dword + 1; i++) {
-                if (!atl2_write_eeprom(hw, ((first_dword+i)*4), eeprom_buff[i]))
-                        return -EIO;
+                if (!atl2_write_eeprom(hw, ((first_dword+i)*4), eeprom_buff[i])) {
+                        ret_val = -EIO;
+                        goto out;
+                }
         }
-
+ out:
         kfree(eeprom_buff);
         return ret_val;
 }
@@ -2106,12 +2106,6 @@ static const struct ethtool_ops atl2_ethtool_ops = {
         .get_eeprom_len         = atl2_get_eeprom_len,
         .get_eeprom             = atl2_get_eeprom,
         .set_eeprom             = atl2_set_eeprom,
-        .get_tx_csum            = atl2_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
-#ifdef NETIF_F_TSO
-        .get_tso                = ethtool_op_get_tso,
-#endif
 };
 
 static void atl2_set_ethtool_ops(struct net_device *netdev)