diff options
| author | Carolyn Wyborny <carolyn.wyborny@intel.com> | 2013-04-25 17:22:34 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2013-05-21 02:49:34 -0700 |
| commit | 2a0a0f1ea27ac39afd25c741a1ccc53bc5530acf (patch) | |
| tree | f02152928cc36effb56bf54d228945e31c5709a1 /drivers/net/ethernet/intel/igb/igb_ethtool.c | |
| parent | 373e6978f9c5c05af3b3ec4cd0295b0bfbe11644 (diff) | |
| download | linux-stable-2a0a0f1ea27ac39afd25c741a1ccc53bc5530acf.tar.gz linux-stable-2a0a0f1ea27ac39afd25c741a1ccc53bc5530acf.tar.bz2 linux-stable-2a0a0f1ea27ac39afd25c741a1ccc53bc5530acf.zip | |
igb: Fix set_ethtool function to call update nvm for entire image
This patch fixes a problem where we were only checking to update checksum
on first part of nvm image. Newer parts have multiple checksum fields and
checksum function will accommodate that as long as we call it in the first
place for any changes made.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 7b25ee2e81c0..85fe7b52f435 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -811,10 +811,8 @@ static int igb_set_eeprom(struct net_device *netdev, ret_val = hw->nvm.ops.write(hw, first_word, last_word - first_word + 1, eeprom_buff); - /* Update the checksum over the first part of the EEPROM if needed - * and flush shadow RAM for 82573 controllers - */ - if ((ret_val == 0) && ((first_word <= NVM_CHECKSUM_REG))) + /* Update the checksum if nvm write succeeded */ + if (ret_val == 0) hw->nvm.ops.update(hw); igb_set_fw_version(adapter); |