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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 9 insertions, 22 deletions

diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
index 103b3aa1afc2..b0b14d63dfbf 100644
--- a/drivers/net/igbvf/ethtool.c
+++ b/drivers/net/igbvf/ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 Intel Corporation.
+  Copyright(c) 2009 - 2010 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -90,18 +90,18 @@ static int igbvf_get_settings(struct net_device *netdev,
         status = er32(STATUS);
         if (status & E1000_STATUS_LU) {
                 if (status & E1000_STATUS_SPEED_1000)
-                        ecmd->speed = 1000;
+                        ethtool_cmd_speed_set(ecmd, SPEED_1000);
                 else if (status & E1000_STATUS_SPEED_100)
-                        ecmd->speed = 100;
+                        ethtool_cmd_speed_set(ecmd, SPEED_100);
                 else
-                        ecmd->speed = 10;
+                        ethtool_cmd_speed_set(ecmd, SPEED_10);
 
                 if (status & E1000_STATUS_FD)
                         ecmd->duplex = DUPLEX_FULL;
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -110,11 +110,6 @@ static int igbvf_get_settings(struct net_device *netdev,
         return 0;
 }
 
-static u32 igbvf_get_link(struct net_device *netdev)
-{
-        return netif_carrier_ok(netdev);
-}
-
 static int igbvf_set_settings(struct net_device *netdev,
                               struct ethtool_cmd *ecmd)
 {
@@ -153,7 +148,7 @@ static int igbvf_set_rx_csum(struct net_device *netdev, u32 data)
 
 static u32 igbvf_get_tx_csum(struct net_device *netdev)
 {
-        return ((netdev->features & NETIF_F_IP_CSUM) != 0);
+        return (netdev->features & NETIF_F_IP_CSUM) != 0;
 }
 
 static int igbvf_set_tx_csum(struct net_device *netdev, u32 data)
@@ -206,13 +201,11 @@ static void igbvf_get_regs(struct net_device *netdev,
         struct igbvf_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         u32 *regs_buff = p;
-        u8 revision_id;
 
         memset(p, 0, IGBVF_REGS_LEN * sizeof(u32));
 
-        pci_read_config_byte(adapter->pdev, PCI_REVISION_ID, &revision_id);
-
-        regs->version = (1 << 24) | (revision_id << 16) | adapter->pdev->device;
+        regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
+                        adapter->pdev->device;
 
         regs_buff[0] = er32(CTRL);
         regs_buff[1] = er32(STATUS);
@@ -398,11 +391,6 @@ static int igbvf_set_wol(struct net_device *netdev,
         return -EOPNOTSUPP;
 }
 
-static int igbvf_phys_id(struct net_device *netdev, u32 data)
-{
-        return 0;
-}
-
 static int igbvf_get_coalesce(struct net_device *netdev,
                               struct ethtool_coalesce *ec)
 {
@@ -515,7 +503,7 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
         .get_msglevel           = igbvf_get_msglevel,
         .set_msglevel           = igbvf_set_msglevel,
         .nway_reset             = igbvf_nway_reset,
-        .get_link               = igbvf_get_link,
+        .get_link               = ethtool_op_get_link,
         .get_eeprom_len         = igbvf_get_eeprom_len,
         .get_eeprom             = igbvf_get_eeprom,
         .set_eeprom             = igbvf_set_eeprom,
@@ -534,7 +522,6 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
         .self_test              = igbvf_diag_test,
         .get_sset_count         = igbvf_get_sset_count,
         .get_strings            = igbvf_get_strings,
-        .phys_id                = igbvf_phys_id,
         .get_ethtool_stats      = igbvf_get_ethtool_stats,
         .get_coalesce           = igbvf_get_coalesce,
         .set_coalesce           = igbvf_set_coalesce,