aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2011-09-29 01:01:29 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-10-17 20:04:30 -0400
commit15e5209f1c606e7c3e9b268f5c7b70b414a859cb (patch)
tree866ec71b0ee79296149d6bee45ee5f70d3db9952 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
parent2fa5eef4d11383f1cfa99d31275e77dcf2d6a0a9 (diff)
ixgbe: change the eeprom version reported by ethtool
Use 32bit value starting at offset 0x2d for displaying the firmware version in ethtool. This should work for all current ixgbe HW Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index fb7d8842a36..8075d11b4cd 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7640,6 +7640,10 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
7640 } 7640 }
7641 device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); 7641 device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
7642 7642
7643 /* save off EEPROM version number */
7644 hw->eeprom.ops.read(hw, 0x2e, &adapter->eeprom_verh);
7645 hw->eeprom.ops.read(hw, 0x2d, &adapter->eeprom_verl);
7646
7643 /* pick up the PCI bus settings for reporting later */ 7647 /* pick up the PCI bus settings for reporting later */
7644 hw->mac.ops.get_bus_info(hw); 7648 hw->mac.ops.get_bus_info(hw);
7645 7649
@@ -7672,9 +7676,6 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
7672 "is required.\n"); 7676 "is required.\n");
7673 } 7677 }
7674 7678
7675 /* save off EEPROM version number */
7676 hw->eeprom.ops.read(hw, 0x29, &adapter->eeprom_version);
7677
7678 /* reset the hardware with the new settings */ 7679 /* reset the hardware with the new settings */
7679 err = hw->mac.ops.start_hw(hw); 7680 err = hw->mac.ops.start_hw(hw);
7680 7681