From 7f8f4f7de404a0364a0717537114d653b50efdae Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Fri, 20 Nov 2009 23:22:20 +0000 Subject: [PATCH] --- yaml --- r: 171777 b: refs/heads/master c: f89271dda9431b432dad7505ccdcb57666233c1d h: refs/heads/master i: 171775: 087aa606f8f6af1430371d602652c5df6ff4ec8d v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ethtool.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2e5fd3a2031a..a6252aa2eb66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fbfca3211ce50d992d66bcda71fc47bf5e268c9 +refs/heads/master: f89271dda9431b432dad7505ccdcb57666233c1d diff --git a/trunk/drivers/net/e1000e/ethtool.c b/trunk/drivers/net/e1000e/ethtool.c index 3af5ee4a4cc8..1ff43b470302 100644 --- a/trunk/drivers/net/e1000e/ethtool.c +++ b/trunk/drivers/net/e1000e/ethtool.c @@ -604,7 +604,9 @@ static int e1000_set_eeprom(struct net_device *netdev, * and flush shadow RAM for applicable controllers */ if ((first_word <= NVM_CHECKSUM_REG) || - (hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82573)) + (hw->mac.type == e1000_82583) || + (hw->mac.type == e1000_82574) || + (hw->mac.type == e1000_82573)) ret_val = e1000e_update_nvm_checksum(hw); out: @@ -1839,6 +1841,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data) if ((hw->phy.type == e1000_phy_ife) || (hw->mac.type == e1000_pchlan) || + (hw->mac.type == e1000_82583) || (hw->mac.type == e1000_82574)) { INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task); if (!adapter->blink_timer.function) {