1 files changed, 38 insertions, 27 deletions

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 67f87a79154..cec2f4e8c61 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel 10 Gigabit PCI Express Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
+  Copyright(c) 1999 - 2009 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,
@@ -89,8 +89,6 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = {
         {"rx_header_split", IXGBE_STAT(rx_hdr_split)},
         {"alloc_rx_page_failed", IXGBE_STAT(alloc_rx_page_failed)},
         {"alloc_rx_buff_failed", IXGBE_STAT(alloc_rx_buff_failed)},
-        {"lro_aggregated", IXGBE_STAT(lro_aggregated)},
-        {"lro_flushed", IXGBE_STAT(lro_flushed)},
 };
 
 #define IXGBE_QUEUE_STATS_LEN \
@@ -132,6 +130,26 @@ static int ixgbe_get_settings(struct net_device *netdev,
                         ecmd->advertising |= ADVERTISED_1000baseT_Full;
 
                 ecmd->port = PORT_TP;
+        } else if (hw->phy.media_type == ixgbe_media_type_backplane) {
+                /* Set as FIBRE until SERDES defined in kernel */
+                switch (hw->device_id) {
+                case IXGBE_DEV_ID_82598:
+                        ecmd->supported |= (SUPPORTED_1000baseT_Full |
+                                SUPPORTED_FIBRE);
+                        ecmd->advertising = (ADVERTISED_10000baseT_Full |
+                                ADVERTISED_1000baseT_Full |
+                                ADVERTISED_FIBRE);
+                        ecmd->port = PORT_FIBRE;
+                        break;
+                case IXGBE_DEV_ID_82598_BX:
+                        ecmd->supported = (SUPPORTED_1000baseT_Full |
+                                           SUPPORTED_FIBRE);
+                        ecmd->advertising = (ADVERTISED_1000baseT_Full |
+                                             ADVERTISED_FIBRE);
+                        ecmd->port = PORT_FIBRE;
+                        ecmd->autoneg = AUTONEG_DISABLE;
+                        break;
+                }
         } else {
                 ecmd->supported |= SUPPORTED_FIBRE;
                 ecmd->advertising = (ADVERTISED_10000baseT_Full |
@@ -206,13 +224,13 @@ static void ixgbe_get_pauseparam(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
         struct ixgbe_hw *hw = &adapter->hw;
 
-        pause->autoneg = (hw->fc.type == ixgbe_fc_full ? 1 : 0);
+        pause->autoneg = (hw->fc.current_mode == ixgbe_fc_full ? 1 : 0);
 
-        if (hw->fc.type == ixgbe_fc_rx_pause) {
+        if (hw->fc.current_mode == ixgbe_fc_rx_pause) {
                 pause->rx_pause = 1;
-        } else if (hw->fc.type == ixgbe_fc_tx_pause) {
+        } else if (hw->fc.current_mode == ixgbe_fc_tx_pause) {
                 pause->tx_pause = 1;
-        } else if (hw->fc.type == ixgbe_fc_full) {
+        } else if (hw->fc.current_mode == ixgbe_fc_full) {
                 pause->rx_pause = 1;
                 pause->tx_pause = 1;
         }
@@ -226,22 +244,17 @@ static int ixgbe_set_pauseparam(struct net_device *netdev,
 
         if ((pause->autoneg == AUTONEG_ENABLE) ||
             (pause->rx_pause && pause->tx_pause))
-                hw->fc.type = ixgbe_fc_full;
+                hw->fc.requested_mode = ixgbe_fc_full;
         else if (pause->rx_pause && !pause->tx_pause)
-                hw->fc.type = ixgbe_fc_rx_pause;
+                hw->fc.requested_mode = ixgbe_fc_rx_pause;
         else if (!pause->rx_pause && pause->tx_pause)
-                hw->fc.type = ixgbe_fc_tx_pause;
+                hw->fc.requested_mode = ixgbe_fc_tx_pause;
         else if (!pause->rx_pause && !pause->tx_pause)
-                hw->fc.type = ixgbe_fc_none;
+                hw->fc.requested_mode = ixgbe_fc_none;
         else
                 return -EINVAL;
 
-        hw->fc.original_type = hw->fc.type;
-
-        if (netif_running(netdev))
-                ixgbe_reinit_locked(adapter);
-        else
-                ixgbe_reset(adapter);
+        hw->mac.ops.setup_fc(hw, 0);
 
         return 0;
 }
@@ -661,10 +674,17 @@ static void ixgbe_get_drvinfo(struct net_device *netdev,
                               struct ethtool_drvinfo *drvinfo)
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        char firmware_version[32];
 
         strncpy(drvinfo->driver, ixgbe_driver_name, 32);
         strncpy(drvinfo->version, ixgbe_driver_version, 32);
-        strncpy(drvinfo->fw_version, "N/A", 32);
+
+        sprintf(firmware_version, "%d.%d-%d",
+                (adapter->eeprom_version & 0xF000) >> 12,
+                (adapter->eeprom_version & 0x0FF0) >> 4,
+                adapter->eeprom_version & 0x000F);
+
+        strncpy(drvinfo->fw_version, firmware_version, 32);
         strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
         drvinfo->n_stats = IXGBE_STATS_LEN;
         drvinfo->regdump_len = ixgbe_get_regs_len(netdev);
@@ -808,15 +828,6 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,
         int stat_count = sizeof(struct ixgbe_queue_stats) / sizeof(u64);
         int j, k;
         int i;
-        u64 aggregated = 0, flushed = 0, no_desc = 0;
-        for (i = 0; i < adapter->num_rx_queues; i++) {
-                aggregated += adapter->rx_ring[i].lro_mgr.stats.aggregated;
-                flushed += adapter->rx_ring[i].lro_mgr.stats.flushed;
-                no_desc += adapter->rx_ring[i].lro_mgr.stats.no_desc;
-        }
-        adapter->lro_aggregated = aggregated;
-        adapter->lro_flushed = flushed;
-        adapter->lro_no_desc = no_desc;
 
         ixgbe_update_stats(adapter);
         for (i = 0; i < IXGBE_GLOBAL_STATS_LEN; i++) {