Commit a71fc313 authored by Fujinaka, Todd's avatar Fujinaka, Todd Committed by Jeff Kirsher

igb: Don't let ethtool try to write to iNVM in i210/i211

Don't let ethtool try to write to iNVM in i210/i211.

This fixes an issue seen by Marek Vasut.
Reported-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarTodd Fujinaka <todd.fujinaka@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 76b81748
...@@ -771,8 +771,10 @@ static int igb_set_eeprom(struct net_device *netdev, ...@@ -771,8 +771,10 @@ static int igb_set_eeprom(struct net_device *netdev,
if (eeprom->len == 0) if (eeprom->len == 0)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (hw->mac.type == e1000_i211) if ((hw->mac.type >= e1000_i210) &&
!igb_get_flash_presence_i210(hw)) {
return -EOPNOTSUPP; return -EOPNOTSUPP;
}
if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16))) if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment