aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/e1000e/ethtool.c5
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
610out: 612out:
@@ -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) {