diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-03-02 21:21:10 -0500 |
---|---|---|
committer | root <root@jk-desktop.jf.intel.com> | 2006-03-02 21:21:10 -0500 |
commit | 6418ecc68e1d9416451b6f78ebb2c0b077e0abf2 (patch) | |
tree | 4fa4a491d559b388e7461192455bd0ebbca5d2b5 /drivers/net/e1000/e1000_ethtool.c | |
parent | 2a1af5d7dfd809b16fb69f3f0fc073d9b6b7c6ac (diff) |
e1000: Add support for new hardware (ESB2)
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 70238e089f16..0d6a16c5f8cd 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -589,6 +589,7 @@ e1000_get_drvinfo(struct net_device *netdev, | |||
589 | case e1000_82571: | 589 | case e1000_82571: |
590 | case e1000_82572: | 590 | case e1000_82572: |
591 | case e1000_82573: | 591 | case e1000_82573: |
592 | case e1000_80003es2lan: | ||
592 | sprintf(firmware_version, "%d.%d-%d", | 593 | sprintf(firmware_version, "%d.%d-%d", |
593 | (eeprom_data & 0xF000) >> 12, | 594 | (eeprom_data & 0xF000) >> 12, |
594 | (eeprom_data & 0x0FF0) >> 4, | 595 | (eeprom_data & 0x0FF0) >> 4, |
@@ -762,6 +763,7 @@ e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data) | |||
762 | /* there are several bits on newer hardware that are r/w */ | 763 | /* there are several bits on newer hardware that are r/w */ |
763 | case e1000_82571: | 764 | case e1000_82571: |
764 | case e1000_82572: | 765 | case e1000_82572: |
766 | case e1000_80003es2lan: | ||
765 | toggle = 0x7FFFF3FF; | 767 | toggle = 0x7FFFF3FF; |
766 | break; | 768 | break; |
767 | case e1000_82573: | 769 | case e1000_82573: |
@@ -1320,6 +1322,7 @@ e1000_set_phy_loopback(struct e1000_adapter *adapter) | |||
1320 | case e1000_82571: | 1322 | case e1000_82571: |
1321 | case e1000_82572: | 1323 | case e1000_82572: |
1322 | case e1000_82573: | 1324 | case e1000_82573: |
1325 | case e1000_80003es2lan: | ||
1323 | return e1000_integrated_phy_loopback(adapter); | 1326 | return e1000_integrated_phy_loopback(adapter); |
1324 | break; | 1327 | break; |
1325 | 1328 | ||