aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/ethtool.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/ethtool.c')
-rw-r--r--drivers/net/e1000e/ethtool.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 875d769531fd..840e8c4fb753 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -588,7 +588,6 @@ static void e1000_get_drvinfo(struct net_device *netdev,
588{ 588{
589 struct e1000_adapter *adapter = netdev_priv(netdev); 589 struct e1000_adapter *adapter = netdev_priv(netdev);
590 char firmware_version[32]; 590 char firmware_version[32];
591 u16 eeprom_data;
592 591
593 strncpy(drvinfo->driver, e1000e_driver_name, 32); 592 strncpy(drvinfo->driver, e1000e_driver_name, 32);
594 strncpy(drvinfo->version, e1000e_driver_version, 32); 593 strncpy(drvinfo->version, e1000e_driver_version, 32);
@@ -597,11 +596,10 @@ static void e1000_get_drvinfo(struct net_device *netdev,
597 * EEPROM image version # is reported as firmware version # for 596 * EEPROM image version # is reported as firmware version # for
598 * PCI-E controllers 597 * PCI-E controllers
599 */ 598 */
600 e1000_read_nvm(&adapter->hw, 5, 1, &eeprom_data);
601 sprintf(firmware_version, "%d.%d-%d", 599 sprintf(firmware_version, "%d.%d-%d",
602 (eeprom_data & 0xF000) >> 12, 600 (adapter->eeprom_vers & 0xF000) >> 12,
603 (eeprom_data & 0x0FF0) >> 4, 601 (adapter->eeprom_vers & 0x0FF0) >> 4,
604 eeprom_data & 0x000F); 602 (adapter->eeprom_vers & 0x000F));
605 603
606 strncpy(drvinfo->fw_version, firmware_version, 32); 604 strncpy(drvinfo->fw_version, firmware_version, 32);
607 strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32); 605 strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);