diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-11-20 18:22:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-21 14:33:44 -0500 |
commit | f89271dda9431b432dad7505ccdcb57666233c1d (patch) | |
tree | ba5258ed4f6ed157abdd168dc97e712cc740a227 /drivers/net/e1000e/ethtool.c | |
parent | 1fbfca3211ce50d992d66bcda71fc47bf5e268c9 (diff) |
e1000e: add missing tests for 82583 in ethtool functions
Add tests for 82583 in a couple ethtool functions that were missed from the
initial hardware enablement submission.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/ethtool.c')
-rw-r--r-- | drivers/net/e1000e/ethtool.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index 3af5ee4a4cc8..1ff43b470302 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
@@ -604,7 +604,9 @@ static int e1000_set_eeprom(struct net_device *netdev, | |||
604 | * and flush shadow RAM for applicable controllers | 604 | * and flush shadow RAM for applicable controllers |
605 | */ | 605 | */ |
606 | if ((first_word <= NVM_CHECKSUM_REG) || | 606 | if ((first_word <= NVM_CHECKSUM_REG) || |
607 | (hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82573)) | 607 | (hw->mac.type == e1000_82583) || |
608 | (hw->mac.type == e1000_82574) || | ||
609 | (hw->mac.type == e1000_82573)) | ||
608 | ret_val = e1000e_update_nvm_checksum(hw); | 610 | ret_val = e1000e_update_nvm_checksum(hw); |
609 | 611 | ||
610 | out: | 612 | out: |
@@ -1839,6 +1841,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data) | |||
1839 | 1841 | ||
1840 | if ((hw->phy.type == e1000_phy_ife) || | 1842 | if ((hw->phy.type == e1000_phy_ife) || |
1841 | (hw->mac.type == e1000_pchlan) || | 1843 | (hw->mac.type == e1000_pchlan) || |
1844 | (hw->mac.type == e1000_82583) || | ||
1842 | (hw->mac.type == e1000_82574)) { | 1845 | (hw->mac.type == e1000_82574)) { |
1843 | INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task); | 1846 | INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task); |
1844 | if (!adapter->blink_timer.function) { | 1847 | if (!adapter->blink_timer.function) { |